;ci: cleanups

Author: simonmichael

.github/workflows/binaries-linux-arm32v7.yml renamed to .github/workflows/_binaries-linux-arm32v7.yml

@@ -1,6 +1,8 @@
-# TRIGGER: Runs on any push to binaries-linux-x64-stack branch. Not normally used.
-# ACTION: Builds, unit-tests and saves mac x64 static binaries with stack and the default ghc. May not work,
-# the cabal-based binaries-linux-x64.yml is normally used instead.
+# Alternate binaries-linux workflow, using stack like the others for consistency. May not work.
+# Currently the cabal-based binaries-linux-x64.yml is used instead, for cabal testing and for easier static building.
+#
+# TRIGGER: Runs on any push to binaries-linux-x64-stack branch.
+# ACTION: Builds, unit-tests and saves mac x64 static binaries with stack and the default ghc.
 
 name: binaries-linux-x64-stack
 on:
@@ -119,15 +121,16 @@ jobs:
     - name: Gather binaries
       run: |
         mkdir tmp
-        cp hledger/shell-completion/hledger-completion.bash hledger/embeddedfiles/*.{1,info} tmp
-        cd tmp
-        cp ~/.local/bin/hledger .
-        cp ~/.local/bin/hledger-ui .
-        cp ~/.local/bin/hledger-web .
-        strip hledger
-        strip hledger-ui
-        strip hledger-web
-        tar cvf hledger-mac-x64.tar hledger hledger-ui hledger-web hledger-completion.bash
+        cp ~/.local/bin/hledger tmp
+        cp ~/.local/bin/hledger-ui tmp
+        cp ~/.local/bin/hledger-web tmp
+        cp hledger/embeddedfiles/*.1 tmp
+        cp hledger/embeddedfiles/*.info tmp
+        cp hledger/shell-completion/hledger-completion.bash tmp
+        strip tmp/hledger
+        strip tmp/hledger-ui
+        strip tmp/hledger-web
+        tar -C tmp cvf hledger-linux-x64.tar hledger hledger-ui hledger-web hledger-completion.bash
 
     # upload-artifact loses execute permissions, so we tar the binaries to preserve them.
     # github UI always zips artifacts when they are downloaded, so we don't bother compressing the tar.

.github/workflows/binaries-linux-x64-stack.yml renamed to .github/workflows/_binaries-linux-x64-stack.yml

@@ -72,12 +72,13 @@ jobs:
         cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-*/x/hledger/build/hledger/hledger tmp
         cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-ui-*/x/hledger-ui/build/hledger-ui/hledger-ui tmp
         cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-web-*/x/hledger-web/build/hledger-web/hledger-web tmp
-        cp hledger/shell-completion/hledger-completion.bash hledger/embeddedfiles/*.1 hledger/embeddedfiles/*.info tmp
-        cd tmp
-        strip hledger
-        strip hledger-ui
-        strip hledger-web
-        tar cvf hledger-linux-x64.tar hledger hledger-ui hledger-web hledger-completion.bash
+        cp hledger/embeddedfiles/*.1 tmp
+        cp hledger/embeddedfiles/*.info tmp
+        cp hledger/shell-completion/hledger-completion.bash tmp
+        strip tmp/hledger
+        strip tmp/hledger-ui
+        strip tmp/hledger-web
+        tar -C tmp cvf hledger-linux-x64.tar hledger hledger-ui hledger-web hledger-completion.bash
 
     # upload-artifact loses execute permissions, so we tar the binaries to preserve them.
     # github UI always zips artifacts when they are downloaded, so we don't bother compressing the tar.

.github/workflows/binaries-linux-x64.yml

@@ -157,15 +157,16 @@ jobs:
     - name: Gather binaries
       run: |
         mkdir tmp
-        cp hledger/shell-completion/hledger-completion.bash hledger/embeddedfiles/*.{1,info} tmp
-        cd tmp
-        cp ~/.local/bin/hledger .
-        cp ~/.local/bin/hledger-ui .
-        cp ~/.local/bin/hledger-web .
-        strip hledger
-        strip hledger-ui
-        strip hledger-web
-        tar cvf hledger-mac-arm64.tar hledger hledger-ui hledger-web hledger-completion.bash
+        cp ~/.local/bin/hledger tmp
+        cp ~/.local/bin/hledger-ui tmp
+        cp ~/.local/bin/hledger-web tmp
+        cp hledger/embeddedfiles/*.1 tmp
+        cp hledger/embeddedfiles/*.info tmp
+        cp hledger/shell-completion/hledger-completion.bash tmp
+        strip tmp/hledger
+        strip tmp/hledger-ui
+        strip tmp/hledger-web
+        tar -C tmp cvf hledger-mac-arm64.tar hledger hledger-ui hledger-web hledger-completion.bash
 
     # upload-artifact loses execute permissions, so we tar the binaries to preserve them.
     # github UI always zips artifacts when they are downloaded, so we don't bother compressing the tar.

.github/workflows/binaries-mac-arm64.yml

@@ -144,15 +144,16 @@ jobs:
     - name: Gather binaries
       run: |
         mkdir tmp
-        cp hledger/shell-completion/hledger-completion.bash hledger/embeddedfiles/*.{1,info} tmp
-        cd tmp
-        cp ~/.local/bin/hledger .
-        cp ~/.local/bin/hledger-ui .
-        cp ~/.local/bin/hledger-web .
-        strip hledger
-        strip hledger-ui
-        strip hledger-web
-        tar cvf hledger-mac-x64.tar hledger hledger-ui hledger-web hledger-completion.bash
+        cp ~/.local/bin/hledger tmp
+        cp ~/.local/bin/hledger-ui tmp
+        cp ~/.local/bin/hledger-web tmp
+        cp hledger/embeddedfiles/*.1 tmp
+        cp hledger/embeddedfiles/*.info tmp
+        cp hledger/shell-completion/hledger-completion.bash tmp
+        strip tmp/hledger
+        strip tmp/hledger-ui
+        strip tmp/hledger-web
+        tar -C tmp cvf hledger-mac-x64.tar hledger hledger-ui hledger-web hledger-completion.bash
 
     # upload-artifact loses execute permissions, so we tar the binaries to preserve them.
     # github UI always zips artifacts when they are downloaded, so we don't bother compressing the tar.

.github/workflows/binaries-mac-x64.yml

@@ -147,14 +147,15 @@ jobs:
     - name: Gather binaries
       run: |
         mkdir tmp
-        cp hledger/shell-completion/hledger-completion.bash hledger/embeddedfiles/*.{1,info} tmp
-        cd tmp
-        cp /C/Users/runneradmin/AppData/Roaming/local/bin/hledger.exe     .
-        cp /C/Users/runneradmin/AppData/Roaming/local/bin/hledger-ui.exe  .
-        cp /C/Users/runneradmin/AppData/Roaming/local/bin/hledger-web.exe .
-        strip hledger.exe
-        strip hledger-ui.exe
-        strip hledger-web.exe
+        cp /C/Users/runneradmin/AppData/Roaming/local/bin/hledger.exe tmp
+        cp /C/Users/runneradmin/AppData/Roaming/local/bin/hledger-ui.exe tmp
+        cp /C/Users/runneradmin/AppData/Roaming/local/bin/hledger-web.exe tmp
+        cp hledger/embeddedfiles/*.1 tmp
+        cp hledger/embeddedfiles/*.info tmp
+        cp hledger/shell-completion/hledger-completion.bash tmp
+        strip tmp/hledger.exe
+        strip tmp/hledger-ui.exe
+        strip tmp/hledger-web.exe
              
     - name: Create binaries artifact
       uses: actions/upload-artifact@v4

.github/workflows/binaries-windows-x64.yml

@@ -97,17 +97,17 @@ jobs:
         allow_forks: false
         path: artifacts
 
-    - name: Get artifact from latest successful binaries-mac-x64 run
+    - name: Get artifact from latest successful binaries-mac-arm64 run
       uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
       with:
-        workflow: binaries-mac-x64.yml
+        workflow: binaries-mac-arm64.yml
         allow_forks: false
         path: artifacts
 
-    - name: Get artifact from latest successful binaries-mac-arm64 run
+    - name: Get artifact from latest successful binaries-mac-x64 run
       uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
       with:
-        workflow: binaries-mac-arm64.yml
+        workflow: binaries-mac-x64.yml
         allow_forks: false
         path: artifacts