From 8b1650c6af6249ebda007321b601bfaf06a87fcd Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 5 Jul 2021 13:24:55 -1000 Subject: [PATCH] ;ci: rename the static linux things --- ...x-arm32v7.yml => linux-static-arm32v7.yml} | 12 +++++------ ...{static-linux.yml => linux-static-x64.yml} | 20 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) rename .github/workflows/{static-linux-arm32v7.yml => linux-static-arm32v7.yml} (77%) rename .github/workflows/{static-linux.yml => linux-static-x64.yml} (79%) diff --git a/.github/workflows/static-linux-arm32v7.yml b/.github/workflows/linux-static-arm32v7.yml similarity index 77% rename from .github/workflows/static-linux-arm32v7.yml rename to .github/workflows/linux-static-arm32v7.yml index fc0130d92..a2e2bd614 100644 --- a/.github/workflows/static-linux-arm32v7.yml +++ b/.github/workflows/linux-static-arm32v7.yml @@ -27,28 +27,28 @@ jobs: with: file: ./docker-static-arm32v7/Dockerfile platforms: linux/arm - tags: hledger-static-linux-arm32v7:latest + tags: hledger-linux-static-arm32v7:latest load: true - name: Extract binaries from docker run: | # Create temporary container from it - container_id=$(docker create hledger-static-linux-arm32v7:latest) + container_id=$(docker create hledger-linux-static-arm32v7:latest) # Copy stuff from temp container - docker cp $container_id:/root/hledger /tmp/hledger-static-linux-arm32v7 + docker cp $container_id:/root/hledger /tmp/hledger-linux-static-arm32v7 # Delete temp container docker rm -v $container_id - name: Upload binary uses: actions/upload-artifact@v2 with: - name: Static Binary - path: /tmp/hledger-static-linux-arm32v7 + name: hledger-linux-static-arm32v7 + path: /tmp/hledger-linux-static-arm32v7 - name: Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: - files: /tmp/hledger-static-linux-arm32v7 + files: /tmp/hledger-linux-static-arm32v7 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/static-linux.yml b/.github/workflows/linux-static-x64.yml similarity index 79% rename from .github/workflows/static-linux.yml rename to .github/workflows/linux-static-x64.yml index f86b1d314..c59484134 100644 --- a/.github/workflows/static-linux.yml +++ b/.github/workflows/linux-static-x64.yml @@ -36,17 +36,17 @@ jobs: - name: Extract and strip binaries run: | mkdir /tmp/hledger - cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-web-*/x/hledger-web/build/hledger-web/hledger-web /tmp/hledger/hledger-web-static-linux-x64 - cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-ui-*/x/hledger-ui/build/hledger-ui/hledger-ui /tmp/hledger/hledger-ui-static-linux-x64 - cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-*/x/hledger/build/hledger/hledger /tmp/hledger/hledger-static-linux-x64 - strip /tmp/hledger/hledger-web-static-linux-x64 - strip /tmp/hledger/hledger-ui-static-linux-x64 - strip /tmp/hledger/hledger-static-linux-x64 + cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-web-*/x/hledger-web/build/hledger-web/hledger-web /tmp/hledger/hledger-web-linux-static-x64 + cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-ui-*/x/hledger-ui/build/hledger-ui/hledger-ui /tmp/hledger/hledger-ui-linux-static-x64 + cp dist-newstyle/build/x86_64-linux/ghc-*/hledger-*/x/hledger/build/hledger/hledger /tmp/hledger/hledger-linux-static-x64 + strip /tmp/hledger/hledger-web-linux-static-x64 + strip /tmp/hledger/hledger-ui-linux-static-x64 + strip /tmp/hledger/hledger-linux-static-x64 - name: Upload binaries uses: actions/upload-artifact@v2 with: - name: Static Binaries + name: hledger-linux-static-x64 path: /tmp/hledger - name: Release @@ -54,8 +54,8 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: files: | - /tmp/hledger/hledger-static-linux-x64 - /tmp/hledger/hledger-web-static-linux-x64 - /tmp/hledger/hledger-ui-static-linux-x64 + /tmp/hledger/hledger-linux-static-x64 + /tmp/hledger/hledger-web-linux-static-x64 + /tmp/hledger/hledger-ui-linux-static-x64 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}