aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-07-12 20:10:49 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-11-24 19:21:11 -0300
commit9bf5e453c63acfb925c5c23fd19bda44f7bdf3b8 (patch)
treecbee0d7c1eea867be5c1d436adcb9f066d8a2038
parentMerge pull request #5449 from kmk3/lutris-fix-lol (diff)
downloadfirejail-9bf5e453c63acfb925c5c23fd19bda44f7bdf3b8.tar.gz
firejail-9bf5e453c63acfb925c5c23fd19bda44f7bdf3b8.tar.zst
firejail-9bf5e453c63acfb925c5c23fd19bda44f7bdf3b8.zip
ci: sort items on paths-ignore lists
Leave quotes only on paths with wildcards so that they are sorted before normal paths, then sort everything. Note that in the current workflow files, ignored directories always use wildcards, so this also ensures that ignored directories (along with all other paths with wildcards) are always listed before ignored files (similarly to `--group-directories-first` in GNU `ls`). This order is similar to the one on .github/workflows/profile-checks.yml.
-rw-r--r--.github/workflows/build-extra.yml16
-rw-r--r--.github/workflows/codeql-analysis.yml4
-rw-r--r--.github/workflows/profile-checks.yml12
3 files changed, 16 insertions, 16 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml
index c0e0062cd..f61e41797 100644
--- a/.github/workflows/build-extra.yml
+++ b/.github/workflows/build-extra.yml
@@ -4,7 +4,10 @@ on:
4 push: 4 push:
5 branches: [ master ] 5 branches: [ master ]
6 paths-ignore: 6 paths-ignore:
7 - '.github/ISSUE_TEMPLATE/*'
8 - 'etc/**'
7 - .git-blame-ignore-revs 9 - .git-blame-ignore-revs
10 - .github/pull_request_template.md
8 - .gitignore 11 - .gitignore
9 - CONTRIBUTING.md 12 - CONTRIBUTING.md
10 - COPYING 13 - COPYING
@@ -12,14 +15,14 @@ on:
12 - README.md 15 - README.md
13 - RELNOTES 16 - RELNOTES
14 - SECURITY.md 17 - SECURITY.md
15 - 'etc/**' 18 - src/firecfg/firecfg.config
16 - 'src/firecfg/firecfg.config'
17 - '.github/ISSUE_TEMPLATE/*'
18 - '.github/pull_request_template.md'
19 pull_request: 19 pull_request:
20 branches: [ master ] 20 branches: [ master ]
21 paths-ignore: 21 paths-ignore:
22 - '.github/ISSUE_TEMPLATE/*'
23 - 'etc/**'
22 - .git-blame-ignore-revs 24 - .git-blame-ignore-revs
25 - .github/pull_request_template.md
23 - .gitignore 26 - .gitignore
24 - CONTRIBUTING.md 27 - CONTRIBUTING.md
25 - COPYING 28 - COPYING
@@ -27,10 +30,7 @@ on:
27 - README.md 30 - README.md
28 - RELNOTES 31 - RELNOTES
29 - SECURITY.md 32 - SECURITY.md
30 - 'etc/**' 33 - src/firecfg/firecfg.config
31 - 'src/firecfg/firecfg.config'
32 - '.github/ISSUE_TEMPLATE/*'
33 - '.github/pull_request_template.md'
34 34
35permissions: # added using https://github.com/step-security/secure-workflows 35permissions: # added using https://github.com/step-security/secure-workflows
36 contents: read 36 contents: read
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2190c9a1d..85110c17e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -9,6 +9,7 @@ on:
9 push: 9 push:
10 branches: [ master ] 10 branches: [ master ]
11 paths-ignore: 11 paths-ignore:
12 - 'etc/**'
12 - .git-blame-ignore-revs 13 - .git-blame-ignore-revs
13 - .gitignore 14 - .gitignore
14 - CONTRIBUTING.md 15 - CONTRIBUTING.md
@@ -17,11 +18,11 @@ on:
17 - README.md 18 - README.md
18 - RELNOTES 19 - RELNOTES
19 - SECURITY.md 20 - SECURITY.md
20 - 'etc/**'
21 pull_request: 21 pull_request:
22 # The branches below must be a subset of the branches above 22 # The branches below must be a subset of the branches above
23 branches: [ master ] 23 branches: [ master ]
24 paths-ignore: 24 paths-ignore:
25 - 'etc/**'
25 - .git-blame-ignore-revs 26 - .git-blame-ignore-revs
26 - .gitignore 27 - .gitignore
27 - CONTRIBUTING.md 28 - CONTRIBUTING.md
@@ -30,7 +31,6 @@ on:
30 - README.md 31 - README.md
31 - RELNOTES 32 - RELNOTES
32 - SECURITY.md 33 - SECURITY.md
33 - 'etc/**'
34 schedule: 34 schedule:
35 - cron: '0 7 * * 2' 35 - cron: '0 7 * * 2'
36 36
diff --git a/.github/workflows/profile-checks.yml b/.github/workflows/profile-checks.yml
index d36d050ab..17e756685 100644
--- a/.github/workflows/profile-checks.yml
+++ b/.github/workflows/profile-checks.yml
@@ -4,17 +4,17 @@ on:
4 push: 4 push:
5 branches: [ master ] 5 branches: [ master ]
6 paths: 6 paths:
7 - 'etc/**'
8 - 'ci/check/profiles/**' 7 - 'ci/check/profiles/**'
9 - 'src/firecfg/firecfg.config' 8 - 'etc/**'
10 - 'contrib/sort.py' 9 - contrib/sort.py
10 - src/firecfg/firecfg.config
11 pull_request: 11 pull_request:
12 branches: [ master ] 12 branches: [ master ]
13 paths: 13 paths:
14 - 'etc/**'
15 - 'ci/check/profiles/**' 14 - 'ci/check/profiles/**'
16 - 'src/firecfg/firecfg.config' 15 - 'etc/**'
17 - 'contrib/sort.py' 16 - contrib/sort.py
17 - src/firecfg/firecfg.config
18 18
19permissions: # added using https://github.com/step-security/secure-workflows 19permissions: # added using https://github.com/step-security/secure-workflows
20 contents: read 20 contents: read