From ee6bac4e490a88670dc466cb9a7ae8609703769f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 18 Jan 2025 11:10:59 +0100 Subject: [PATCH] ci: Fix release name of x86-64 binaries This should have been x86-64, only x64 is not a thing. --- .github/workflows/build.yaml | 16 ++++++++-------- .github/workflows/ci.yaml | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0a2ce0ef9..862084ba8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,7 +30,7 @@ concurrency: jobs: static: - name: Nix - Linux static + name: Nix - Linux x86-64 static runs-on: ubuntu-24.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -44,7 +44,7 @@ jobs: - name: Save built executable as artifact uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: - name: postgrest-linux-static-x64 + name: postgrest-linux-static-x86-64 path: result/bin/postgrest if-no-files-found: error @@ -53,7 +53,7 @@ jobs: - name: Save built Docker image as artifact uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: - name: postgrest-docker-x64 + name: postgrest-docker-x86-64 path: postgrest-docker.tar.gz if-no-files-found: error @@ -87,13 +87,13 @@ jobs: fail-fast: false matrix: include: - - name: Linux + - name: Linux x86-64 runs-on: ubuntu-24.04 cache: | ~/.stack/pantry ~/.stack/snapshots ~/.stack/stack.sqlite3 - # no artifact for Linux, because we use the static build + # no artifact for Linux x86-64, because we use the static build - name: MacOS runs-on: macos-14 @@ -114,7 +114,7 @@ jobs: ~\AppData\Roaming\stack\stack.sqlite3 ~\AppData\Local\Programs\stack\stack.sqlite3 deps: Add-Content $env:GITHUB_PATH $env:PGBIN - artifact: postgrest-windows-x64 + artifact: postgrest-windows-x86-64 name: Stack - ${{ matrix.name }} runs-on: ${{ matrix.runs-on }} @@ -168,7 +168,7 @@ jobs: token: ${{ github.token }} task: Build FreeBSD (Stack) download: bin - upload: postgrest-freebsd-x64 + upload: postgrest-freebsd-x86-64 cabal: @@ -176,7 +176,7 @@ jobs: matrix: ghc: ['9.6.6', '9.8.2'] fail-fast: false - name: Cabal - Linux GHC ${{ matrix.ghc }} + name: Cabal - Linux x86-64 - GHC ${{ matrix.ghc }} runs-on: ubuntu-24.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4b10330f3..71a1e224c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -210,20 +210,20 @@ jobs: mkdir -p release-bundle - tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-linux-static-x64.tar.xz" \ - -C artifacts/postgrest-linux-static-x64 postgrest + tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-linux-static-x86-64.tar.xz" \ + -C artifacts/postgrest-linux-static-x86-64 postgrest tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-macos-aarch64.tar.xz" \ -C artifacts/postgrest-macos-aarch64 postgrest - tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-freebsd-x64.tar.xz" \ - -C artifacts/postgrest-freebsd-x64 postgrest + tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-freebsd-x86-64.tar.xz" \ + -C artifacts/postgrest-freebsd-x86-64 postgrest tar cJvf "release-bundle/postgrest-${GITHUB_REF_NAME}-ubuntu-aarch64.tar.xz" \ -C artifacts/postgrest-ubuntu-aarch64 postgrest - zip --junk-paths "release-bundle/postgrest-${GITHUB_REF_NAME}-windows-x64.zip" \ - artifacts/postgrest-windows-x64/postgrest.exe + zip --junk-paths "release-bundle/postgrest-${GITHUB_REF_NAME}-windows-x86-64.zip" \ + artifacts/postgrest-windows-x86-64/postgrest.exe - name: Save release bundle uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 @@ -277,7 +277,7 @@ jobs: - name: Download Docker image uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: - name: postgrest-docker-x64 + name: postgrest-docker-x86-64 - name: Publish images on Docker Hub run: | docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"