Merge pull request #239 from Security-Tools-Alliance/fix/bump-version…

…-2.1.1 fix: bump version 2.1.1
Security-Tools-Alliance · Nov 28, 2024 · 1331ac3 · 1331ac3
2 parents 5c4d823 + a05c491
commit 1331ac3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git 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={{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={{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

diff --git a/web/reNgine/version.txt b/web/reNgine/version.txt
@@ -1 +1 @@
-2.1.0
+2.1.1