From 52714cda21cdaf85b97484b7aa31dfe43be1edbe Mon Sep 17 00:00:00 2001 From: charlesgauthereau Date: Wed, 28 Jan 2026 22:25:53 +0100 Subject: [PATCH] chore(release): 1.0.4-rc.15 --- .github/workflows/docker.yml | 24 ++++++++++++++---------- CITATION.cff | 2 +- Cargo.lock | 2 +- Cargo.toml | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8ed04b2..080cb1a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -101,7 +101,7 @@ jobs: name: Build AMD64 Image runs-on: ubuntu-latest outputs: - image: ${{ steps.set-tags.outputs.amd64_image }} + image: ${{ steps.set-job-output.outputs.image }} steps: - uses: actions/checkout@v4 @@ -112,7 +112,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set image tag + - name: Set AMD64 image tag id: set-tags run: | REF_NAME=${GITHUB_REF#refs/tags/} @@ -129,15 +129,16 @@ jobs: tags: ${{ steps.set-tags.outputs.amd64_image }} target: ${{ inputs.target }} - - name: Set job output + - name: Set job output for manifest + id: set-job-output run: | echo "image=${{ steps.set-tags.outputs.amd64_image }}" >> $GITHUB_OUTPUT build-arm64: name: Build ARM64 Image - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-24.04-arm # native ARM64 runner outputs: - image: ${{ steps.set-tags.outputs.arm64_image }} + image: ${{ steps.set-job-output.outputs.image }} steps: - uses: actions/checkout@v4 @@ -148,7 +149,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set image tag + - name: Set ARM64 image tag id: set-tags run: | REF_NAME=${GITHUB_REF#refs/tags/} @@ -165,11 +166,11 @@ jobs: tags: ${{ steps.set-tags.outputs.arm64_image }} target: ${{ inputs.target }} - - name: Set job output + - name: Set job output for manifest + id: set-job-output run: | echo "image=${{ steps.set-tags.outputs.arm64_image }}" >> $GITHUB_OUTPUT - create-manifest: name: Create Multi-Arch Manifest runs-on: ubuntu-latest @@ -188,10 +189,13 @@ jobs: IMAGE="${{ inputs.image_name }}:$REF_NAME" AMD64_IMAGE="${{ needs.build-amd64.outputs.image }}" ARM64_IMAGE="${{ needs.build-arm64.outputs.image }}" - + + echo "AMD64_IMAGE=$AMD64_IMAGE" + echo "ARM64_IMAGE=$ARM64_IMAGE" + docker manifest create $IMAGE $AMD64_IMAGE $ARM64_IMAGE docker manifest push $IMAGE - + if [ "${{ inputs.add_latest }}" = "true" ]; then docker manifest create ${{ inputs.image_name }}:latest $AMD64_IMAGE $ARM64_IMAGE docker manifest push ${{ inputs.image_name }}:latest diff --git a/CITATION.cff b/CITATION.cff index 38a254e..4574ce9 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -22,5 +22,5 @@ keywords: - self-hosted - portabase license: Apache-2.0 -version: 1.0.4-rc.14 +version: 1.0.4-rc.15 date-released: "2026-01-28" \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 5749ced..26b913f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1595,7 +1595,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portabase-agent" -version = "1.0.4-rc.13" +version = "1.0.4-rc.14" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 1212347..c7a77f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "portabase-agent" -version = "1.0.4-rc.14" +version = "1.0.4-rc.15" edition = "2024" [dependencies]