diff --git a/.github/workflows/binaries-linux-arm32v7-static.yml b/.github/workflows/binaries-linux-arm32v7.yml similarity index 73% rename from .github/workflows/binaries-linux-arm32v7-static.yml rename to .github/workflows/binaries-linux-arm32v7.yml index 4e188a816..cc1bf8ae7 100644 --- a/.github/workflows/binaries-linux-arm32v7-static.yml +++ b/.github/workflows/binaries-linux-arm32v7.yml @@ -4,11 +4,11 @@ # Currently runs no tests. # Slow, will probably time out. -name: binaries-linux-arm32v7-static +name: binaries-linux-arm32v7 on: push: - branches: [ binaries-linux-arm32v7-static ] + branches: [ binaries-linux-arm32v7 ] #tags: # - '[0-9]+.[0-9]+' # - '[0-9]+.[0-9]+-*' @@ -30,18 +30,18 @@ jobs: id: docker_build uses: docker/build-push-action@v2 with: - file: ./docker-static-arm32v7/Dockerfile + file: ./docker-arm32v7/Dockerfile platforms: linux/arm - tags: hledger-linux-static-arm32v7:latest + tags: hledger-linux-arm32v7:latest load: true - name: Gather binaries from docker run: | - container_id=$(docker create hledger-linux-static-arm32v7:latest) + container_id=$(docker create hledger-linux-arm32v7:latest) docker cp $container_id:/root/hledger tmp docker rm -v $container_id cd tmp - tar cvf hledger-linux-static-arm32v7.tar hledger hledger-ui hledger-web + tar cvf hledger-linux-arm32v7.tar hledger hledger-ui hledger-web # 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. @@ -49,5 +49,5 @@ jobs: - name: Upload binaries artifact uses: actions/upload-artifact@v3 with: - name: hledger-linux-static-arm32v7 - path: tmp/hledger-linux-static-arm32v7.tar + name: hledger-linux-arm32v7 + path: tmp/hledger-linux-arm32v7.tar diff --git a/.github/workflows/binaries-linux-x64-static.yml b/.github/workflows/binaries-linux-x64.yml similarity index 98% rename from .github/workflows/binaries-linux-x64-static.yml rename to .github/workflows/binaries-linux-x64.yml index 82794c601..1523595d1 100644 --- a/.github/workflows/binaries-linux-x64-static.yml +++ b/.github/workflows/binaries-linux-x64.yml @@ -6,11 +6,11 @@ # Was using ghc 9.0 to avoid segfaults with the ghc 9.2 binaries on alpine, https://gitlab.haskell.org/ghc/ghc/-/issues/20266 # Trying latest ghc 9.8 now. -name: binaries-linux-x64-static +name: binaries-linux-x64 on: push: - branches: [ binaries-linux-x64-static, binaries ] + branches: [ binaries-linux-x64, binaries ] #tags: # - '[0-9]+.[0-9]+' # - '[0-9]+.[0-9]+-*' diff --git a/docker-static-arm32v7/Dockerfile b/docker-arm32v7/Dockerfile similarity index 100% rename from docker-static-arm32v7/Dockerfile rename to docker-arm32v7/Dockerfile