From 9bf5e453c63acfb925c5c23fd19bda44f7bdf3b8 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Tue, 12 Jul 2022 20:10:49 -0300
Subject: 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.
---
 .github/workflows/build-extra.yml     | 16 ++++++++--------
 .github/workflows/codeql-analysis.yml |  4 ++--
 .github/workflows/profile-checks.yml  | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to '.github/workflows')

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:
   push:
     branches: [ master ]
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*'
+      - 'etc/**'
       - .git-blame-ignore-revs
+      - .github/pull_request_template.md
       - .gitignore
       - CONTRIBUTING.md
       - COPYING
@@ -12,14 +15,14 @@ on:
       - README.md
       - RELNOTES
       - SECURITY.md
-      - 'etc/**'
-      - 'src/firecfg/firecfg.config'
-      - '.github/ISSUE_TEMPLATE/*'
-      - '.github/pull_request_template.md'
+      - src/firecfg/firecfg.config
   pull_request:
     branches: [ master ]
     paths-ignore:
+      - '.github/ISSUE_TEMPLATE/*'
+      - 'etc/**'
       - .git-blame-ignore-revs
+      - .github/pull_request_template.md
       - .gitignore
       - CONTRIBUTING.md
       - COPYING
@@ -27,10 +30,7 @@ on:
       - README.md
       - RELNOTES
       - SECURITY.md
-      - 'etc/**'
-      - 'src/firecfg/firecfg.config'
-      - '.github/ISSUE_TEMPLATE/*'
-      - '.github/pull_request_template.md'
+      - src/firecfg/firecfg.config
 
 permissions:  # added using https://github.com/step-security/secure-workflows
   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:
   push:
     branches: [ master ]
     paths-ignore:
+      - 'etc/**'
       - .git-blame-ignore-revs
       - .gitignore
       - CONTRIBUTING.md
@@ -17,11 +18,11 @@ on:
       - README.md
       - RELNOTES
       - SECURITY.md
-      - 'etc/**'
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master ]
     paths-ignore:
+      - 'etc/**'
       - .git-blame-ignore-revs
       - .gitignore
       - CONTRIBUTING.md
@@ -30,7 +31,6 @@ on:
       - README.md
       - RELNOTES
       - SECURITY.md
-      - 'etc/**'
   schedule:
     - cron: '0 7 * * 2'
 
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:
   push:
     branches: [ master ]
     paths:
-      - 'etc/**'
       - 'ci/check/profiles/**'
-      - 'src/firecfg/firecfg.config'
-      - 'contrib/sort.py'
+      - 'etc/**'
+      - contrib/sort.py
+      - src/firecfg/firecfg.config
   pull_request:
     branches: [ master ]
     paths:
-      - 'etc/**'
       - 'ci/check/profiles/**'
-      - 'src/firecfg/firecfg.config'
-      - 'contrib/sort.py'
+      - 'etc/**'
+      - contrib/sort.py
+      - src/firecfg/firecfg.config
 
 permissions:  # added using https://github.com/step-security/secure-workflows
   contents: read
-- 
cgit v1.2.3-54-g00ecf