From 4c65288368b86d003bb922e1b31120cb845712e2 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Thu, 14 Nov 2024 11:39:22 -0700 Subject: [PATCH 01/16] chore: wip Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cf38359d..33cf1830 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -215,6 +215,10 @@ jobs: run: | echo "OWNER=${GITHUB_REPOSITORY_OWNER,,}" >>$GITHUB_ENV + - name: test_stuff + run: | + echo "ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}" + - name: Build and push (tag) uses: docker/build-push-action@v6 if: ${{ startsWith(github.ref, 'refs/tags/v') }} From bc2b9dbd5fca1e847923f1eba796487a36d9fbf9 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Thu, 14 Nov 2024 11:54:13 -0700 Subject: [PATCH 02/16] chore: nuke stuff Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 148 +++++++++++++++++----------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33cf1830..a4ed9a28 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,34 +29,34 @@ jobs: uploadArtifactSuffix: 'linux-amd64', buildOutputPath: 'target/x86_64-unknown-linux-musl/release/wadm', } - - { - runnerOs: 'ubuntu-latest', - buildCommand: 'cargo zigbuild', - target: 'aarch64-unknown-linux-musl', - uploadArtifactSuffix: 'linux-aarch64', - buildOutputPath: 'target/aarch64-unknown-linux-musl/release/wadm', - } - - { - runnerOs: 'macos-14', - buildCommand: 'cargo zigbuild', - target: 'x86_64-apple-darwin', - uploadArtifactSuffix: 'macos-amd64', - buildOutputPath: 'target/x86_64-apple-darwin/release/wadm', - } - - { - runnerOs: 'macos-14', - buildCommand: 'cargo zigbuild', - target: 'aarch64-apple-darwin', - uploadArtifactSuffix: 'macos-aarch64', - buildOutputPath: 'target/aarch64-apple-darwin/release/wadm', - } - - { - runnerOs: 'windows-latest', - buildCommand: 'cargo build', - target: 'x86_64-pc-windows-msvc', - uploadArtifactSuffix: 'windows-amd64', - buildOutputPath: 'target/x86_64-pc-windows-msvc/release/wadm.exe', - } +# - { +# runnerOs: 'ubuntu-latest', +# buildCommand: 'cargo zigbuild', +# target: 'aarch64-unknown-linux-musl', +# uploadArtifactSuffix: 'linux-aarch64', +# buildOutputPath: 'target/aarch64-unknown-linux-musl/release/wadm', +# } +# - { +# runnerOs: 'macos-14', +# buildCommand: 'cargo zigbuild', +# target: 'x86_64-apple-darwin', +# uploadArtifactSuffix: 'macos-amd64', +# buildOutputPath: 'target/x86_64-apple-darwin/release/wadm', +# } +# - { +# runnerOs: 'macos-14', +# buildCommand: 'cargo zigbuild', +# target: 'aarch64-apple-darwin', +# uploadArtifactSuffix: 'macos-aarch64', +# buildOutputPath: 'target/aarch64-apple-darwin/release/wadm', +# } +# - { +# runnerOs: 'windows-latest', +# buildCommand: 'cargo build', +# target: 'x86_64-pc-windows-msvc', +# uploadArtifactSuffix: 'windows-amd64', +# buildOutputPath: 'target/x86_64-pc-windows-msvc/release/wadm.exe', +# } steps: - uses: actions/checkout@v4 @@ -122,53 +122,53 @@ jobs: sha256sum "${tarball}" >> SHA256SUMS done - - name: Create github release - uses: softprops/action-gh-release@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - prerelease: false - draft: false - files: | - SHA256SUMS - wadm-${{ env.RELEASE_VERSION }}-linux-aarch64.tar.gz - wadm-${{ env.RELEASE_VERSION }}-linux-amd64.tar.gz - wadm-${{ env.RELEASE_VERSION }}-macos-aarch64.tar.gz - wadm-${{ env.RELEASE_VERSION }}-macos-amd64.tar.gz - wadm-${{ env.RELEASE_VERSION }}-windows-amd64.tar.gz - - crate: - if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/types-v') || startsWith(github.ref, 'refs/tags/client-v') }} - name: Publish crate - runs-on: ubuntu-latest - needs: build - steps: - - uses: actions/checkout@v4 - - name: Install latest Rust stable toolchain - uses: dtolnay/rust-toolchain@stable - with: - toolchain: stable - - - name: Cargo login - run: | - cargo login ${{ secrets.CRATES_TOKEN }} - - - name: Cargo publish wadm-types - if: ${{ startsWith(github.ref, 'refs/tags/types-v') }} - working-directory: ./crates/wadm-types - run: | - cargo publish +# - name: Create github release +# uses: softprops/action-gh-release@v2 +# with: +# token: ${{ secrets.GITHUB_TOKEN }} +# prerelease: false +# draft: false +# files: | +# SHA256SUMS +# wadm-${{ env.RELEASE_VERSION }}-linux-aarch64.tar.gz +# wadm-${{ env.RELEASE_VERSION }}-linux-amd64.tar.gz +# wadm-${{ env.RELEASE_VERSION }}-macos-aarch64.tar.gz +# wadm-${{ env.RELEASE_VERSION }}-macos-amd64.tar.gz +# wadm-${{ env.RELEASE_VERSION }}-windows-amd64.tar.gz - - name: Cargo publish wadm lib - if: ${{ startsWith(github.ref, 'refs/tags/v') }} - working-directory: ./crates/wadm - run: | - cargo publish - - - name: Cargo publish wadm-client - if: ${{ startsWith(github.ref, 'refs/tags/client-v') }} - working-directory: ./crates/wadm-client - run: | - cargo publish +# crate: +# if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/types-v') || startsWith(github.ref, 'refs/tags/client-v') }} +# name: Publish crate +# runs-on: ubuntu-latest +# needs: build +# steps: +# - uses: actions/checkout@v4 +# - name: Install latest Rust stable toolchain +# uses: dtolnay/rust-toolchain@stable +# with: +# toolchain: stable +# +# - name: Cargo login +# run: | +# cargo login ${{ secrets.CRATES_TOKEN }} +# +# - name: Cargo publish wadm-types +# if: ${{ startsWith(github.ref, 'refs/tags/types-v') }} +# working-directory: ./crates/wadm-types +# run: | +# cargo publish +# +# - name: Cargo publish wadm lib +# if: ${{ startsWith(github.ref, 'refs/tags/v') }} +# working-directory: ./crates/wadm +# run: | +# cargo publish +# +# - name: Cargo publish wadm-client +# if: ${{ startsWith(github.ref, 'refs/tags/client-v') }} +# working-directory: ./crates/wadm-client +# run: | +# cargo publish docker-image: name: Build and push docker images From dbb86e032eff72eb95bfafbd3b531514a4873ff3 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Thu, 14 Nov 2024 12:14:38 -0700 Subject: [PATCH 03/16] chore: wip Signed-off-by: Sudhanshu Pandey --- .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 a4ed9a28..cb7bfe87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -215,7 +215,7 @@ jobs: run: | echo "OWNER=${GITHUB_REPOSITORY_OWNER,,}" >>$GITHUB_ENV - - name: test_stuff + - name: test_stuff_2 run: | echo "ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}" From c04893fed6ba5918f963685c2de35ddebdb0aaea Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Thu, 14 Nov 2024 12:16:29 -0700 Subject: [PATCH 04/16] chore: wip Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb7bfe87..aca51983 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -218,6 +218,7 @@ jobs: - name: test_stuff_2 run: | echo "ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}" + echo "${{ env.RELEASE_VERSION#v }}" - name: Build and push (tag) uses: docker/build-push-action@v6 From 1d36ca349b911ecbd6e38c7b1e1311d98b44f3af Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Thu, 14 Nov 2024 12:22:57 -0700 Subject: [PATCH 05/16] chore: wip Signed-off-by: Sudhanshu Pandey --- .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 aca51983..214b58cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -218,7 +218,7 @@ jobs: - name: test_stuff_2 run: | echo "ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}" - echo "${{ env.RELEASE_VERSION#v }}" + echo "test:${{ env.RELEASE_VERSION#v }}" - name: Build and push (tag) uses: docker/build-push-action@v6 From c43ac86deaa3354e30781524275ff8c749d9a62b Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 07:19:50 -0500 Subject: [PATCH 06/16] chore: add the tag logic Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 214b58cd..4b700b73 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -215,10 +215,14 @@ jobs: run: | echo "OWNER=${GITHUB_REPOSITORY_OWNER,,}" >>$GITHUB_ENV + - name: Set the formatted release version for the docker tag + if: ${{ startsWith(github.ref, 'refs/tags/v') }} + run: | + echo "DOCKER_TAG_RELEASE_VERSION=${GITHUB_REF/refs\/tags\/v/}" >> ${{ env.RELEASE_VERSION }} + - name: test_stuff_2 - run: | - echo "ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}" - echo "test:${{ env.RELEASE_VERSION#v }}" + run: | + echo "${{ env.DOCKER_TAG_RELEASE_VERSION }}" - name: Build and push (tag) uses: docker/build-push-action@v6 @@ -232,6 +236,7 @@ jobs: BIN_AMD64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-amd64 tags: ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }} + - name: Build and push wolfi (tag) uses: docker/build-push-action@v6 if: ${{ startsWith(github.ref, 'refs/tags/v') }} From e8670094675707ad147506572ace7216b191f14f Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 07:37:46 -0500 Subject: [PATCH 07/16] chore: add the tag logic Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4b700b73..fb92f590 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -218,11 +218,11 @@ jobs: - name: Set the formatted release version for the docker tag if: ${{ startsWith(github.ref, 'refs/tags/v') }} run: | - echo "DOCKER_TAG_RELEASE_VERSION=${GITHUB_REF/refs\/tags\/v/}" >> ${{ env.RELEASE_VERSION }} + echo "RELEASE_VERSION_DOCKER_TAG=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV - name: test_stuff_2 run: | - echo "${{ env.DOCKER_TAG_RELEASE_VERSION }}" + echo "${{ env.RELEASE_VERSION_DOCKER_TAG }}" - name: Build and push (tag) uses: docker/build-push-action@v6 From da9cdc39182164cb7047ca18ecd3642e10b6b6a6 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 07:48:23 -0500 Subject: [PATCH 08/16] chore: check if tag works Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb92f590..6912b48e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,19 +122,19 @@ jobs: sha256sum "${tarball}" >> SHA256SUMS done -# - name: Create github release -# uses: softprops/action-gh-release@v2 -# with: -# token: ${{ secrets.GITHUB_TOKEN }} -# prerelease: false -# draft: false -# files: | -# SHA256SUMS -# wadm-${{ env.RELEASE_VERSION }}-linux-aarch64.tar.gz -# wadm-${{ env.RELEASE_VERSION }}-linux-amd64.tar.gz -# wadm-${{ env.RELEASE_VERSION }}-macos-aarch64.tar.gz -# wadm-${{ env.RELEASE_VERSION }}-macos-amd64.tar.gz -# wadm-${{ env.RELEASE_VERSION }}-windows-amd64.tar.gz + - name: Create github release + uses: softprops/action-gh-release@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + prerelease: false + draft: false + files: | + SHA256SUMS + wadm-${{ env.RELEASE_VERSION }}-linux-aarch64.tar.gz + wadm-${{ env.RELEASE_VERSION }}-linux-amd64.tar.gz + wadm-${{ env.RELEASE_VERSION }}-macos-aarch64.tar.gz + wadm-${{ env.RELEASE_VERSION }}-macos-amd64.tar.gz + wadm-${{ env.RELEASE_VERSION }}-windows-amd64.tar.gz # crate: # if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/types-v') || startsWith(github.ref, 'refs/tags/client-v') }} From b0179ee2d91e0bae2c40bddf7b9b9c98702d70d5 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 07:50:08 -0500 Subject: [PATCH 09/16] chore: revert the workflow changes Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 66 +++++++++++++++++------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6912b48e..23169d09 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -136,39 +136,39 @@ jobs: wadm-${{ env.RELEASE_VERSION }}-macos-amd64.tar.gz wadm-${{ env.RELEASE_VERSION }}-windows-amd64.tar.gz -# crate: -# if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/types-v') || startsWith(github.ref, 'refs/tags/client-v') }} -# name: Publish crate -# runs-on: ubuntu-latest -# needs: build -# steps: -# - uses: actions/checkout@v4 -# - name: Install latest Rust stable toolchain -# uses: dtolnay/rust-toolchain@stable -# with: -# toolchain: stable -# -# - name: Cargo login -# run: | -# cargo login ${{ secrets.CRATES_TOKEN }} -# -# - name: Cargo publish wadm-types -# if: ${{ startsWith(github.ref, 'refs/tags/types-v') }} -# working-directory: ./crates/wadm-types -# run: | -# cargo publish -# -# - name: Cargo publish wadm lib -# if: ${{ startsWith(github.ref, 'refs/tags/v') }} -# working-directory: ./crates/wadm -# run: | -# cargo publish -# -# - name: Cargo publish wadm-client -# if: ${{ startsWith(github.ref, 'refs/tags/client-v') }} -# working-directory: ./crates/wadm-client -# run: | -# cargo publish + crate: + if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/types-v') || startsWith(github.ref, 'refs/tags/client-v') }} + name: Publish crate + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v4 + - name: Install latest Rust stable toolchain + uses: dtolnay/rust-toolchain@stable + with: + toolchain: stable + + - name: Cargo login + run: | + cargo login ${{ secrets.CRATES_TOKEN }} + + - name: Cargo publish wadm-types + if: ${{ startsWith(github.ref, 'refs/tags/types-v') }} + working-directory: ./crates/wadm-types + run: | + cargo publish + + - name: Cargo publish wadm lib + if: ${{ startsWith(github.ref, 'refs/tags/v') }} + working-directory: ./crates/wadm + run: | + cargo publish + + - name: Cargo publish wadm-client + if: ${{ startsWith(github.ref, 'refs/tags/client-v') }} + working-directory: ./crates/wadm-client + run: | + cargo publish docker-image: name: Build and push docker images From f9e508006b5dbf8cdb0cde00559a1651552fe74d Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 07:51:05 -0500 Subject: [PATCH 10/16] chore: revert the workflow changes Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23169d09..5f14510b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,34 +29,34 @@ jobs: uploadArtifactSuffix: 'linux-amd64', buildOutputPath: 'target/x86_64-unknown-linux-musl/release/wadm', } -# - { -# runnerOs: 'ubuntu-latest', -# buildCommand: 'cargo zigbuild', -# target: 'aarch64-unknown-linux-musl', -# uploadArtifactSuffix: 'linux-aarch64', -# buildOutputPath: 'target/aarch64-unknown-linux-musl/release/wadm', -# } -# - { -# runnerOs: 'macos-14', -# buildCommand: 'cargo zigbuild', -# target: 'x86_64-apple-darwin', -# uploadArtifactSuffix: 'macos-amd64', -# buildOutputPath: 'target/x86_64-apple-darwin/release/wadm', -# } -# - { -# runnerOs: 'macos-14', -# buildCommand: 'cargo zigbuild', -# target: 'aarch64-apple-darwin', -# uploadArtifactSuffix: 'macos-aarch64', -# buildOutputPath: 'target/aarch64-apple-darwin/release/wadm', -# } -# - { -# runnerOs: 'windows-latest', -# buildCommand: 'cargo build', -# target: 'x86_64-pc-windows-msvc', -# uploadArtifactSuffix: 'windows-amd64', -# buildOutputPath: 'target/x86_64-pc-windows-msvc/release/wadm.exe', -# } + - { + runnerOs: 'ubuntu-latest', + buildCommand: 'cargo zigbuild', + target: 'aarch64-unknown-linux-musl', + uploadArtifactSuffix: 'linux-aarch64', + buildOutputPath: 'target/aarch64-unknown-linux-musl/release/wadm', + } + - { + runnerOs: 'macos-14', + buildCommand: 'cargo zigbuild', + target: 'x86_64-apple-darwin', + uploadArtifactSuffix: 'macos-amd64', + buildOutputPath: 'target/x86_64-apple-darwin/release/wadm', + } + - { + runnerOs: 'macos-14', + buildCommand: 'cargo zigbuild', + target: 'aarch64-apple-darwin', + uploadArtifactSuffix: 'macos-aarch64', + buildOutputPath: 'target/aarch64-apple-darwin/release/wadm', + } + - { + runnerOs: 'windows-latest', + buildCommand: 'cargo build', + target: 'x86_64-pc-windows-msvc', + uploadArtifactSuffix: 'windows-amd64', + buildOutputPath: 'target/x86_64-pc-windows-msvc/release/wadm.exe', + } steps: - uses: actions/checkout@v4 From 2ef57d1277e5afafa0f6d2c1ad5d9a5676558675 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 07:52:20 -0500 Subject: [PATCH 11/16] chore: remove debug logic Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5f14510b..5f5c7459 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -220,10 +220,6 @@ jobs: run: | echo "RELEASE_VERSION_DOCKER_TAG=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV - - name: test_stuff_2 - run: | - echo "${{ env.RELEASE_VERSION_DOCKER_TAG }}" - - name: Build and push (tag) uses: docker/build-push-action@v6 if: ${{ startsWith(github.ref, 'refs/tags/v') }} From faae0e83c28c0b2f8e53134db1fad68cfa720560 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 07:54:39 -0500 Subject: [PATCH 12/16] chore: add tags to docker image Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5f5c7459..6fdaa38d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -230,7 +230,9 @@ jobs: build-args: | BIN_ARM64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-aarch64 BIN_AMD64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-amd64 - tags: ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }} + tags: | + ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}, + ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION_DOCKER_TAG }} - name: Build and push wolfi (tag) @@ -244,7 +246,10 @@ jobs: build-args: | BIN_ARM64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-aarch64 BIN_AMD64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-amd64 - tags: ghcr.io/${{ env.OWNER }}/wadm:latest-wolfi,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}-wolfi + tags: | + ghcr.io/${{ env.OWNER }}/wadm:latest-wolfi,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}-wolfi, + ghcr.io/${{ env.OWNER }}/wadm:latest-wolfi,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION_DOCKER_TAG }}-wolfi + - name: Build and push (main) uses: docker/build-push-action@v6 From 5ad5c9566fbc4004cc85b9a68069162e8aee97c8 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 21:33:27 -0500 Subject: [PATCH 13/16] chore: Simplify and test the tag Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6fdaa38d..5d085c93 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -218,7 +218,10 @@ jobs: - name: Set the formatted release version for the docker tag if: ${{ startsWith(github.ref, 'refs/tags/v') }} run: | - echo "RELEASE_VERSION_DOCKER_TAG=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV + echo "RELEASE_VERSION_DOCKER_TAG=${RELEASE_VERSION#v}" >> $GITHUB_ENV + + - name: Test run + run: echo "${{ env.RELEASE_VERSION_DOCKER_TAG }}" - name: Build and push (tag) uses: docker/build-push-action@v6 From 4a3144623a4cac073068b467d8007025052c64db Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Mon, 18 Nov 2024 21:44:16 -0500 Subject: [PATCH 14/16] chore: remove the debug code Signed-off-by: Sudhanshu Pandey --- .github/workflows/release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d085c93..b76881c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -220,9 +220,6 @@ jobs: run: | echo "RELEASE_VERSION_DOCKER_TAG=${RELEASE_VERSION#v}" >> $GITHUB_ENV - - name: Test run - run: echo "${{ env.RELEASE_VERSION_DOCKER_TAG }}" - - name: Build and push (tag) uses: docker/build-push-action@v6 if: ${{ startsWith(github.ref, 'refs/tags/v') }} From 0b3b7076806559020aa138d6be7b40e71920f507 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Tue, 19 Nov 2024 16:55:16 -0500 Subject: [PATCH 15/16] Update .github/workflows/release.yml Co-authored-by: Joonas Bergius Signed-off-by: Joonas Bergius --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b76881c7..ea5bdfb9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -247,9 +247,9 @@ jobs: BIN_ARM64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-aarch64 BIN_AMD64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-amd64 tags: | - ghcr.io/${{ env.OWNER }}/wadm:latest-wolfi,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}-wolfi, - ghcr.io/${{ env.OWNER }}/wadm:latest-wolfi,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION_DOCKER_TAG }}-wolfi - + ghcr.io/${{ env.OWNER }}/wadm:latest-wolfi + ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}-wolfi + ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION_DOCKER_TAG }}-wolfi - name: Build and push (main) uses: docker/build-push-action@v6 From 03f7beff3827850dad64db157877d5b5aa7c0fa9 Mon Sep 17 00:00:00 2001 From: Sudhanshu Pandey Date: Tue, 19 Nov 2024 16:55:34 -0500 Subject: [PATCH 16/16] Update .github/workflows/release.yml Co-authored-by: Joonas Bergius Signed-off-by: Joonas Bergius --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea5bdfb9..99a0a8cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -231,9 +231,9 @@ jobs: BIN_ARM64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-aarch64 BIN_AMD64=./artifacts/wadm-${{ env.RELEASE_VERSION }}-linux-amd64 tags: | - ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}, - ghcr.io/${{ env.OWNER }}/wadm:latest,ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION_DOCKER_TAG }} - + ghcr.io/${{ env.OWNER }}/wadm:latest + ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION }}, + ghcr.io/${{ env.OWNER }}/wadm:${{ env.RELEASE_VERSION_DOCKER_TAG }} - name: Build and push wolfi (tag) uses: docker/build-push-action@v6