From 59121168da4e93dbc3f38ec3357a07e0f0ff476a Mon Sep 17 00:00:00 2001 From: psyray Date: Sun, 24 Nov 2024 19:29:47 +0100 Subject: [PATCH 1/3] fix: bump release version to 2.1.1 --- web/reNgine/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/reNgine/version.txt b/web/reNgine/version.txt index 50aea0e7..7c327287 100644 --- a/web/reNgine/version.txt +++ b/web/reNgine/version.txt @@ -1 +1 @@ -2.1.0 \ No newline at end of file +2.1.1 \ No newline at end of file From a88720b5fe90def23fb415c4d4918fdd5922517d Mon Sep 17 00:00:00 2001 From: psyray Date: Sun, 24 Nov 2024 20:02:25 +0100 Subject: [PATCH 2/3] fix(build): add the missing v in the build image tag --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d9788af..7d2f5048 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,8 +48,8 @@ jobs: tags: | type=ref,event=branch type=ref,event=pr - type=semver,pattern={{version}},enable=${{ github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v') || contains(github.ref, 'release/') }} - type=semver,pattern={{major}}.{{minor}},enable=${{ github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v') || contains(github.ref, 'release/') }} + type=semver,pattern=v{{version}},enable=${{ github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v') || contains(github.ref, 'release/') }} + type=semver,pattern=v{{major}}.{{minor}},enable=${{ github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v') || contains(github.ref, 'release/') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }} flavor: | prefix=rengine-${{ matrix.image }}-,onlatest=true From a05c4912d37c0e5a4a3bb860f3bb57b7a5f3dfdc Mon Sep 17 00:00:00 2001 From: psyray Date: Sun, 24 Nov 2024 21:23:59 +0100 Subject: [PATCH 3/3] fix: rework tag name for release/ branch only --- .github/workflows/build.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d2f5048..1626b3dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,16 +40,23 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Get version + id: get_version + run: | + VERSION=$(cat web/reNgine/version.txt) + echo "version=$VERSION" >> $GITHUB_OUTPUT + - name: Docker meta id: meta uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.PROJECT }} tags: | - type=ref,event=branch + type=ref,event=branch,enable=${{ !contains(github.ref, 'release/') }} type=ref,event=pr - type=semver,pattern=v{{version}},enable=${{ github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v') || contains(github.ref, 'release/') }} - type=semver,pattern=v{{major}}.{{minor}},enable=${{ github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v') || contains(github.ref, 'release/') }} + type=semver,pattern={{version}},enable=${{ github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v') }} + type=raw,value=v${{ steps.get_version.outputs.version }},enable=${{ contains(github.ref, 'release/') }} + type=semver,pattern={{major}}.{{minor}},enable=${{ github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }} flavor: | prefix=rengine-${{ matrix.image }}-,onlatest=true