ci: reproducible license sort

ben-grande · Jul 8, 2024 · 6eb13fa · 6eb13fa
1 parent 49fb82a
commit 6eb13fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -40,12 +40,6 @@ jobs:
       - name: Install OS packages
         # yamllint disable-line rule:line-length
         run: sudo apt-get install -y $(cat dependencies/debian.txt)
-      - name: Show how licenses are rendered order
-        run: |
-          reuse --root salt/dom0 lint || true
-          ./scripts/spec-get.sh dom0 license
-          ./scripts/spec-get.sh dom0 license_csv
-          ./scripts/spec-gen.sh test dom0
       - name: Remove externally managed python environment flag
         # yamllint disable-line rule:line-length
         run: sudo dpkg-divert --rename --add /usr/lib/$(py3versions -d)/EXTERNALLY-MANAGED

diff --git a/scripts/spec-get.sh b/scripts/spec-get.sh
@@ -88,8 +88,8 @@ fi
 
 if test "${key}" = "license" || test "${key}" = "license_csv"; then
   license_csv="$(reuse --root "${project_dir}" lint |
-    awk -F ':' '/^\* Used licenses:/{print $2}' | tr " " "\n" | sort -d |
-    tr -s "\n" " " | tr -d " ")"
+    awk -F ':' '/^\* Used licenses:/{print $2}' | tr " " "\n" | tr -d "," |
+    sort -d | tr -s "\n" "," | sed "s/^\,//;s/\,$//")"
   license="$(echo "${license_csv}" | sed "s/\,/ AND /g")"
 fi