Simplify workflows

Signed-off-by: Ethan Dye <[email protected]>
ecdye · Dec 19, 2024 · 038333b · 038333b
1 parent 9e74aaa
commit 038333b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 25 deletions.
diff --git a/.github/workflows/release-action.yml b/.github/workflows/release-action.yml
@@ -20,8 +20,8 @@ jobs:
         run: |
           export tag="${{ github.ref_name }}"
           sudo apt-get install lzip
-          git archive --format=tar --prefix=zram-config-${tag}/ ${tag} -o zram-config-${tag}.tar
-          lzip -9 --keep --verbose --verbose zram-config-${tag}.tar
+          git ls-files --recurse-submodules | tar -cf zram-config-${tag}.tar --xform s:^:zram-config-${tag}/: --verbatim-files-from -T-
+          lzip --best --keep --verbose --verbose zram-config-${tag}.tar
           gpg --detach-sign --armor zram-config-${tag}.tar.lz
           gpg --verify zram-config-${tag}.tar.lz.asc zram-config-${tag}.tar.lz
           unset tag

diff --git a/.github/workflows/shellcheck-action.yml b/.github/workflows/shellcheck-action.yml
@@ -20,30 +20,13 @@ jobs:
     steps:
        - name: Checkout repository
          uses: actions/checkout@v4
-       - name: Setup environment
-         run: sudo -E bash -c set
        - name: "ShellCheck tests/*.bash"
-         run: |
-           echo "ShellCheck zram-config..."
-           if shellcheck -x -s bash tests/*.bash; then echo "OK"; else echo "FAILED"; exit 1; fi
-         shell: bash
+         run: shellcheck -x -s bash tests/*.bash
        - name: "ShellCheck install.bash"
-         run: |
-           echo "ShellCheck install.bash..."
-           if shellcheck -x -s bash install.bash; then echo "OK"; else echo "FAILED"; exit 1; fi
-         shell: bash
+         run: shellcheck -x -s bash install.bash
        - name: "ShellCheck update.bash"
-         run: |
-           echo "ShellCheck update.bash..."
-           if shellcheck -x -s bash update.bash; then echo "OK"; else echo "FAILED"; exit 1; fi
-         shell: bash
+         run: shellcheck -x -s bash update.bash
        - name: "ShellCheck uninstall.bash"
-         run: |
-           echo "ShellCheck uninstall.bash..."
-           if shellcheck -x -s bash uninstall.bash; then echo "OK"; else echo "FAILED"; exit 1; fi
-         shell: bash
+         run: shellcheck -x -s bash uninstall.bash
        - name: "ShellCheck zram-config"
-         run: |
-           echo "ShellCheck zram-config..."
-           if shellcheck -x -s bash zram-config; then echo "OK"; else echo "FAILED"; exit 1; fi
-         shell: bash
+         run: shellcheck -x -s bash zram-config
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
@@ -29,7 +29,6 @@ jobs:
        - name: Setup environment
          id: setup
          run: |
-           sudo -E bash -c set
            sudo apt-get update
            sudo apt-get install --yes expect systemd-container qemu-user-static qemu-utils qemu-system-arm libfdt-dev binfmt-support
            echo "imagexz=$(basename "$(curl "https://downloads.raspberrypi.org/raspios_lite_armhf_latest" -s -L -I  -o /dev/null -w '%{url_effective}')")" >> $GITHUB_OUTPUT