Skip to content

Commit

Permalink
🔀 Merge pull request #468 from Schneegans/feature/fix-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Schneegans authored Nov 6, 2024
2 parents d500f09 + 67f2a89 commit 75a3641
Show file tree
Hide file tree
Showing 96 changed files with 476 additions and 448 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/badges.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Download cloc
run: sudo apt-get update -y && sudo apt-get install -y cloc
- name: Get the Numbers
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Download Clang-Format
run: |
sudo apt update -qq
Expand All @@ -33,22 +33,22 @@ jobs:
name: Check Compliance with REUSE Specification
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: REUSE Compliance Check
uses: fsfe/reuse-action@v1
uses: fsfe/reuse-action@v4

comment_percentage:
name: Check Comment Percentage
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
steps:
- name: Checkout Current Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: current
ref: ${{ github.ref }}
- name: Checkout Base Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: base
ref: ${{ github.base_ref }}
Expand All @@ -74,7 +74,7 @@ jobs:
name: Run ShellCheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run ShellCheck
run: |
find $GITHUB_WORKSPACE -type f -and \( -name "*.sh" \) | xargs shellcheck
Expand All @@ -95,7 +95,7 @@ jobs:
- "gnome-xsession"
- "gnome-wayland-nested"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download Dependencies
run: |
sudo apt update -qq
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update -q
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update -q
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ jobs:
references:
name: Generate References
runs-on: ubuntu-22.04
if: >
github.event_name == 'push' && contains(github.event.head_commit.message, '[generate-references]')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download Dependencies
run: |
sudo apt update -qq
Expand Down
33 changes: 0 additions & 33 deletions .reuse/dep5

This file was deleted.

52 changes: 52 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# SPDX-FileCopyrightText: Simon Schneegans <[email protected]>
# SPDX-License-Identifier: CC0-1.0

version = 1

[[annotations]]
path = "tests/references/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "Simon Schneegans <[email protected]>"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "kwin/metadata.desktop.in"
precedence = "aggregate"
SPDX-FileCopyrightText = "Simon Schneegans <[email protected]>"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "resources/credits/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "Simon Schneegans <[email protected]>"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "resources/img/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "Simon Schneegans <[email protected]>"
SPDX-License-Identifier = "CC-BY-4.0"

[[annotations]]
path = "docs/pics/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "Simon Schneegans <[email protected]>"
SPDX-License-Identifier = "CC-BY-4.0"

[[annotations]]
path = "assets/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "Simon Schneegans <[email protected]>"
SPDX-License-Identifier = "CC-BY-4.0"

[[annotations]]
path = "po/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "Simon Schneegans <[email protected]>"
SPDX-License-Identifier = "GPL-3.0-or-later"

[[annotations]]
path = "metadata.json"
precedence = "aggregate"
SPDX-FileCopyrightText = "Simon Schneegans <[email protected]>"
SPDX-License-Identifier = "GPL-3.0-or-later"
2 changes: 1 addition & 1 deletion prefs.js
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ GitHub: <a href='https://github.com/sponsors/schneegans'>https://github.com/spon
const translators = new Set();
this._getJSONResource('/credits/translators.json').forEach(i => {
for (const j of Object.values(i)) {
j.forEach(k => translators.add(k[1]));
j.forEach(k => translators.add(k.full_name));
}
});

Expand Down
Loading

0 comments on commit 75a3641

Please sign in to comment.