From 0640fa98c00b08b30585b5121d95b94ffbe0296a Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Wed, 13 Aug 2025 21:31:44 -0400 Subject: [PATCH 01/10] added version numbers to releases --- .github/workflows/release.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4852a09..8004713 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,8 @@ on: push: tags: - 'v*' # This will trigger the workflow on any push to a tag starting with 'v' + branches: + - feature/update-release-to-include-version-numbers permissions: contents: write @@ -38,6 +40,12 @@ jobs: - name: Build binary run: cargo zigbuild --release --target ${{ matrix.target }} + - name: Get Cargo.toml version + id: get_cargo_version + run: | + CARGO_VERSION=$(awk '/^version = "/ {gsub(/"/, "", $3); print $3; exit}' Cargo.toml) + echo "Cargo Version = v$CARGO_VERSION" + - name: Rename binary for upload run: | CURRENT_TAG=${{ github.ref_name }} @@ -45,13 +53,20 @@ jobs: if [[ "${{ matrix.target }}" == *windows* ]]; then ext=".exe"; fi mkdir -p dist cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-${{ matrix.target }}$ext + cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-v$CARGO_VERSION-${{ matrix.target }}$ext - - name: Upload artifact + - name: Upload artifact - no version uses: actions/upload-artifact@v4 with: name: binaries-${{ matrix.binary_name }}-${{ matrix.target }} path: dist/* + - name: Upload artifact - with versions + uses: actions/upload-artifact@v4 + with: + name: binaries-${{ matrix.binary_name }}-v{ $CARGO_VERSION }-${{ matrix.target }} + path: dist/* + release: name: Create Release needs: build From cf743b43f1435378f75b273ce67478fe7610578e Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 05:48:18 -0400 Subject: [PATCH 02/10] fixed version variable call --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8004713..f30a95f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,6 +45,7 @@ jobs: run: | CARGO_VERSION=$(awk '/^version = "/ {gsub(/"/, "", $3); print $3; exit}' Cargo.toml) echo "Cargo Version = v$CARGO_VERSION" + echo "CARGO_VERSION=$CARGO_VERSION" >> $GITHUB_ENV - name: Rename binary for upload run: | @@ -64,7 +65,7 @@ jobs: - name: Upload artifact - with versions uses: actions/upload-artifact@v4 with: - name: binaries-${{ matrix.binary_name }}-v{ $CARGO_VERSION }-${{ matrix.target }} + name: binaries-${{ matrix.binary_name }}-v${{ env.CARGO_VERSION }}-${{ matrix.target }} path: dist/* release: From cb4b325d825822eb0d944a9632c4dc987ba955e3 Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 05:51:47 -0400 Subject: [PATCH 03/10] removed call to build release on this branch --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f30a95f..1898811 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,8 +4,6 @@ on: push: tags: - 'v*' # This will trigger the workflow on any push to a tag starting with 'v' - branches: - - feature/update-release-to-include-version-numbers permissions: contents: write From 684a92fe17412ca29b679190177e604ad1009a08 Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 05:58:36 -0400 Subject: [PATCH 04/10] Update .github/workflows/release.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1898811..81ea494 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: if [[ "${{ matrix.target }}" == *windows* ]]; then ext=".exe"; fi mkdir -p dist cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-${{ matrix.target }}$ext - cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-v$CARGO_VERSION-${{ matrix.target }}$ext + cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-v${{ env.CARGO_VERSION }}-${{ matrix.target }}$ext - name: Upload artifact - no version uses: actions/upload-artifact@v4 From ed0942738b86e55e05744d634b2a8fe22b13875b Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 05:59:38 -0400 Subject: [PATCH 05/10] Update .github/workflows/release.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81ea494..ac7d8b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: - name: Get Cargo.toml version id: get_cargo_version run: | - CARGO_VERSION=$(awk '/^version = "/ {gsub(/"/, "", $3); print $3; exit}' Cargo.toml) + CARGO_VERSION=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version') echo "Cargo Version = v$CARGO_VERSION" echo "CARGO_VERSION=$CARGO_VERSION" >> $GITHUB_ENV From e621207c8e355cb4058c7929e6d571ea13b3b16d Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 06:00:08 -0400 Subject: [PATCH 06/10] Update .github/workflows/release.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac7d8b4..240f7cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,6 +62,8 @@ jobs: - name: Upload artifact - with versions uses: actions/upload-artifact@v4 + - name: Upload artifact + uses: actions/upload-artifact@v4 with: name: binaries-${{ matrix.binary_name }}-v${{ env.CARGO_VERSION }}-${{ matrix.target }} path: dist/* From e9ea24552a302cb2b332ee7646716adf8625007e Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 06:01:08 -0400 Subject: [PATCH 07/10] Revert "removed call to build release on this branch" This reverts commit cb4b325d825822eb0d944a9632c4dc987ba955e3. --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 240f7cf..8565f78 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,8 @@ on: push: tags: - 'v*' # This will trigger the workflow on any push to a tag starting with 'v' + branches: + - feature/update-release-to-include-version-numbers permissions: contents: write From 5a22691b99871099bf199433aa76647a3efb1119 Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 06:03:47 -0400 Subject: [PATCH 08/10] fixed upload artifacts --- .github/workflows/release.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8565f78..8d265bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,14 +56,6 @@ jobs: cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-${{ matrix.target }}$ext cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-v${{ env.CARGO_VERSION }}-${{ matrix.target }}$ext - - name: Upload artifact - no version - uses: actions/upload-artifact@v4 - with: - name: binaries-${{ matrix.binary_name }}-${{ matrix.target }} - path: dist/* - - - name: Upload artifact - with versions - uses: actions/upload-artifact@v4 - name: Upload artifact uses: actions/upload-artifact@v4 with: From ea13e386c0fe945da3089304b5330dfb67d0b989 Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 06:05:34 -0400 Subject: [PATCH 09/10] Reapply "removed call to build release on this branch" This reverts commit e9ea24552a302cb2b332ee7646716adf8625007e. --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d265bb..07bac43 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,8 +4,6 @@ on: push: tags: - 'v*' # This will trigger the workflow on any push to a tag starting with 'v' - branches: - - feature/update-release-to-include-version-numbers permissions: contents: write From c1bda847356236df2680b86b8910c1c3d28e123b Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 14 Aug 2025 06:09:08 -0400 Subject: [PATCH 10/10] Update .github/workflows/release.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07bac43..ffdf0c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,6 @@ jobs: ext="" if [[ "${{ matrix.target }}" == *windows* ]]; then ext=".exe"; fi mkdir -p dist - cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-${{ matrix.target }}$ext cp target/${{ matrix.target }}/release/wrapd$ext dist/${{ matrix.binary_name }}-v${{ env.CARGO_VERSION }}-${{ matrix.target }}$ext - name: Upload artifact