From 0e6d79a5068871be0456411d67a1189b6b6ca45f Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Mon, 28 Jul 2025 16:34:54 -0500 Subject: [PATCH 01/13] Updating checkout task to current version to see if this gets us better git support --- .github/workflows/release-binary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 30f1583..df14a33 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -24,7 +24,7 @@ jobs: CGO_ENABLED: 0 steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build ${{ matrix.goosarch }} binary run: | apt update From 03fe8489f91af8d5fdb42bafc857b849bc33e5d0 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Mon, 28 Jul 2025 16:38:21 -0500 Subject: [PATCH 02/13] Grab it all --- .github/workflows/release-binary.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index df14a33..c528332 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -25,6 +25,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Build ${{ matrix.goosarch }} binary run: | apt update From 9c29b508c8a746db39dcc0a6935a9716f421fca9 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Mon, 28 Jul 2025 17:07:29 -0500 Subject: [PATCH 03/13] Explicitly adding to git's safe dir --- .github/workflows/release-binary.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index c528332..b5b5191 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -25,8 +25,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Build ${{ matrix.goosarch }} binary run: | apt update @@ -37,6 +35,7 @@ jobs: export GOARCH=${GOOSARCH#*/} mkdir -p artifacts + git config --global --add safe.directory . if [ "$GOOS" = "windows" ]; then go build -o cql-proxy.exe From a3dae628e49e447de7e8bcebd093e136c4852c9a Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Mon, 28 Jul 2025 17:13:03 -0500 Subject: [PATCH 04/13] Maybe we just need to update git? --- .github/workflows/release-binary.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index b5b5191..42dc5f9 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -28,14 +28,13 @@ jobs: - name: Build ${{ matrix.goosarch }} binary run: | apt update - apt -y install zip + apt -y install zip git export GOOSARCH=${{ matrix.goosarch }} export GOOS=${GOOSARCH%/*} export GOARCH=${GOOSARCH#*/} mkdir -p artifacts - git config --global --add safe.directory . if [ "$GOOS" = "windows" ]; then go build -o cql-proxy.exe From 60045797bae52de7f5876b4fd62f979bda3e2aaa Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Mon, 28 Jul 2025 17:26:19 -0500 Subject: [PATCH 05/13] Think this might be a git thing after all --- .github/workflows/release-binary.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 42dc5f9..e4a2bb9 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -28,14 +28,16 @@ jobs: - name: Build ${{ matrix.goosarch }} binary run: | apt update - apt -y install zip git + apt -y install zip export GOOSARCH=${{ matrix.goosarch }} export GOOS=${GOOSARCH%/*} export GOARCH=${GOOSARCH#*/} mkdir -p artifacts - + + git status + if [ "$GOOS" = "windows" ]; then go build -o cql-proxy.exe zip -vr cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.zip cql-proxy.exe LICENSE From 9f6747da2dd0d354812dcd5dc49d57814dc785a2 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Tue, 29 Jul 2025 11:07:08 -0500 Subject: [PATCH 06/13] Now that we know it's definitely a git thing let's see if we can fix it --- .github/workflows/release-binary.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index e4a2bb9..3564fa6 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -36,7 +36,7 @@ jobs: mkdir -p artifacts - git status + git config --global --add safe.directory /__w/cql-proxy/cql-proxy if [ "$GOOS" = "windows" ]; then go build -o cql-proxy.exe @@ -49,9 +49,8 @@ jobs: fi mv cql-proxy-* artifacts - - name: Upload ${{ matrix.goosarch }} binaries - uses: softprops/action-gh-release@v1 + - name: Store generated binaries + uses: actions/upload-artifact@v4 with: - name: ${{ github.ref_name }} - files: | - artifacts/* + name: binaries + path: artifacts From 0a8f6f22eea829f55480f4e8499f35f68e1df7b9 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Tue, 29 Jul 2025 11:08:50 -0500 Subject: [PATCH 07/13] Whitespace fix --- .github/workflows/release-binary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 3564fa6..58c52fd 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -53,4 +53,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: binaries - path: artifacts + path: artifacts From 9473cf3d2dc4f5bdb1431fb99e1c124988840e83 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Tue, 29 Jul 2025 11:12:27 -0500 Subject: [PATCH 08/13] Let's try distinct artifact names --- .github/workflows/release-binary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 58c52fd..9668677 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -52,5 +52,5 @@ jobs: - name: Store generated binaries uses: actions/upload-artifact@v4 with: - name: binaries + name: binaries-${GOOS}-${GOARCH}-${{ github.ref_name }} path: artifacts From a77320b4e7e3f95484f8799ae2cdf418545865b0 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Tue, 29 Jul 2025 11:17:07 -0500 Subject: [PATCH 09/13] Is it... too long? --- .github/workflows/release-binary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 9668677..3952f02 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -52,5 +52,5 @@ jobs: - name: Store generated binaries uses: actions/upload-artifact@v4 with: - name: binaries-${GOOS}-${GOARCH}-${{ github.ref_name }} + name: cql-proxy-${GOOS}-${GOARCH} path: artifacts From 797e235f96d0962194e023005454baae33f44439 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Tue, 29 Jul 2025 11:28:02 -0500 Subject: [PATCH 10/13] Okay, how about if we simplify things a bit --- .github/workflows/release-binary.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 3952f02..60c0280 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -34,8 +34,6 @@ jobs: export GOOS=${GOOSARCH%/*} export GOARCH=${GOOSARCH#*/} - mkdir -p artifacts - git config --global --add safe.directory /__w/cql-proxy/cql-proxy if [ "$GOOS" = "windows" ]; then @@ -47,10 +45,8 @@ jobs: tar cvfz cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.tgz cql-proxy LICENSE sha256sum cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.tgz | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}-sha256.txt fi - - mv cql-proxy-* artifacts - name: Store generated binaries uses: actions/upload-artifact@v4 with: name: cql-proxy-${GOOS}-${GOARCH} - path: artifacts + path: cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.tgz From 1a56cd7b6b834b92f0f2772982ad1dbdb33f04be Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Tue, 29 Jul 2025 11:34:15 -0500 Subject: [PATCH 11/13] A variation on a theme --- .github/workflows/release-binary.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 60c0280..fca7d43 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -35,6 +35,7 @@ jobs: export GOARCH=${GOOSARCH#*/} git config --global --add safe.directory /__w/cql-proxy/cql-proxy + mkdir -p artifacts if [ "$GOOS" = "windows" ]; then go build -o cql-proxy.exe @@ -45,8 +46,10 @@ jobs: tar cvfz cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.tgz cql-proxy LICENSE sha256sum cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.tgz | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}-sha256.txt fi + mv cql-proxy-* artifacts + - name: Store generated binaries uses: actions/upload-artifact@v4 with: name: cql-proxy-${GOOS}-${GOARCH} - path: cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.tgz + path: artifacts/* From 64c35fe98112ecb04d89fc4d05cb459cdc341115 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Tue, 29 Jul 2025 13:32:39 -0500 Subject: [PATCH 12/13] Trying for uniqueness --- .github/workflows/release-binary.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index fca7d43..88e3a6d 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -39,17 +39,17 @@ jobs: if [ "$GOOS" = "windows" ]; then go build -o cql-proxy.exe - zip -vr cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.zip cql-proxy.exe LICENSE - sha256sum cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.zip | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}-sha256.txt + zip -vr cql-proxy-${GOOS}-${GOARCH}-0.2.0-1.zip cql-proxy.exe LICENSE + sha256sum cql-proxy-${GOOS}-${GOARCH}-0.2.0-1.zip | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-0.2.0-1-sha256.txt else go build -o cql-proxy - tar cvfz cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.tgz cql-proxy LICENSE - sha256sum cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}.tgz | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-${{ github.ref_name }}-sha256.txt + tar cvfz cql-proxy-${GOOS}-${GOARCH}-0.2.0-1.tgz cql-proxy LICENSE + sha256sum cql-proxy-${GOOS}-${GOARCH}-0.2.0-1.tgz | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-0.2.0-1-sha256.txt fi mv cql-proxy-* artifacts - name: Store generated binaries uses: actions/upload-artifact@v4 with: - name: cql-proxy-${GOOS}-${GOARCH} + name: cql-proxy-${GOOS}-${GOARCH}-0.2.0-1 path: artifacts/* From 43ba596cc127ebd7f54aa5009c35c982e3378529 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Tue, 29 Jul 2025 15:28:37 -0500 Subject: [PATCH 13/13] Okay, let's start using identifiers that are actually unique --- .github/workflows/release-binary.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml index 88e3a6d..aedb0f6 100644 --- a/.github/workflows/release-binary.yml +++ b/.github/workflows/release-binary.yml @@ -39,17 +39,17 @@ jobs: if [ "$GOOS" = "windows" ]; then go build -o cql-proxy.exe - zip -vr cql-proxy-${GOOS}-${GOARCH}-0.2.0-1.zip cql-proxy.exe LICENSE - sha256sum cql-proxy-${GOOS}-${GOARCH}-0.2.0-1.zip | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-0.2.0-1-sha256.txt + zip -vr cql-proxy-${GOOS}-${GOARCH}-0.2.0.zip cql-proxy.exe LICENSE + sha256sum cql-proxy-${GOOS}-${GOARCH}-0.2.0.zip | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-0.2.0-sha256.txt else go build -o cql-proxy - tar cvfz cql-proxy-${GOOS}-${GOARCH}-0.2.0-1.tgz cql-proxy LICENSE - sha256sum cql-proxy-${GOOS}-${GOARCH}-0.2.0-1.tgz | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-0.2.0-1-sha256.txt + tar cvfz cql-proxy-${GOOS}-${GOARCH}-0.2.0.tgz cql-proxy LICENSE + sha256sum cql-proxy-${GOOS}-${GOARCH}-0.2.0.tgz | cut -d ' ' -f 1 > cql-proxy-${GOOS}-${GOARCH}-0.2.0-sha256.txt fi mv cql-proxy-* artifacts - name: Store generated binaries uses: actions/upload-artifact@v4 with: - name: cql-proxy-${GOOS}-${GOARCH}-0.2.0-1 + name: cql-proxy-0.2.0-${{ github.run_number }}-${{ strategy.job-index }} path: artifacts/*