test tags

Signed-off-by: Peter Skopek <[email protected]>
keycloak · Sep 5, 2024 · 1f86659 · 1f86659
1 parent 87a0087
commit 1f86659
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,8 @@ defaults:
 
 jobs:
 
-  repo:
+  repo-prep:
+    name: Prepare repository
     runs-on: ubuntu-latest
     steps:
       - name: show-inputs
@@ -38,34 +39,36 @@ jobs:
       - name: test-checkout
         run: |
           find $GITHUB_WORKSPACE
+      - name: Maven environment setup
+        run: |
+          cat $GITHUB_WORKSPACE/.github/env/release-env | sed -r '/^\s*$/d' >> $GITHUB_ENV
 
-  env:
-    uses: ./.github/workflows/x-env.yml
-    needs: [repo]
-
-  create-tags:
-    name: Create tags
-    needs: [repo, env]
-    uses: ./.github/workflows/x-create-tags.yml
-    with:
-      tag: ${{ github.event.inputs.version }}
-      branch: ${{ github.event.inputs.branch }}
-      set-versions: true
-    secrets:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  create-tag:
+    name: Create tag
+    runs-on: ubuntu-latest
+    needs: repo-prep
+    steps:
+      - name: Create version commit
+        run: |
+          ./set-version.sh ${{ inputs.version }}
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          git commit -a -m "Set version to ${{ inputs.version }}"
+      - name: Tag commit
+        run: git tag --force ${{ inputs.version }}
+      - name: Push changes
+        run: git push --force origin refs/tags/${{ inputs.version }}
 
   keycloak-client:
     name: Keycloak Client
-    needs: [repo, env, create-tags]
+    needs: [repo-prep, create-tag]
     uses: ./.github/workflows/x-keycloak-client.yml
     with:
       mvn-url: ${{ needs.env.outputs.mvn-releases-url }}
-      tag: ${{ github.event.inputs.version }}
-      deploy-skip: ${{ needs.env.outputs.deploy-skip }}
+      tag: ${{ inputs.version }}
+      deploy-skip: ${{ inputs.deploy-skip }}
     secrets:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       MVN_USERNAME: ${{ secrets.MVN_USERNAME }}
       MVN_TOKEN: ${{ secrets.MVN_TOKEN }}
       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-
diff --git a/.github/workflows/x-create-tags.yml b/.github/workflows/x-create-tags.yml
@@ -15,9 +15,6 @@ on:
         required: false
         type: boolean
         default: false
-    secrets:
-      GH_TOKEN:
-        required: true
 
 defaults:
   run: