ci: prepare merge to main

InseeFr · Sep 27, 2023 · 1df489a · 1df489a
1 parent b363cc8
commit 1df489a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 27 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -76,39 +76,48 @@ jobs:
           name: eno-ws-jar
           path: ./eno-ws/build/libs/*.jar
 
-  create-release:
+  create-tag:
     needs: [ check-version, build-sources ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: rickstaa/action-create-tag@v1
         with:
-          ref: ${{ github.ref }}
-          fetch-depth: 0
-
-      - name: Get previous final release tag
-        id: previousTag
-        run: echo "previousTag=$(git --no-pager tag --sort=creatordate --merged ${{ github.ref_name }} | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$" | tail -1)" >> $GITHUB_OUTPUT
-
-      - name: Create release note
-        id: changelog
-        uses: requarks/changelog-action@v1
-        with:
-          fromTag: ${{ github.sha }}
-          toTag: ${{ steps.previousTag.outputs.previousTag}}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          writeToFile: false
-
-      - uses: softprops/action-gh-release@v1
-        with:
-          tag_name: ${{ needs.check-version.outputs.release-version }}
-          target_commitish: ${{ github.head_ref || github.ref }}
-          name: ${{ needs.check-version.outputs.release-version }}
-          body: ${{steps.changelog.outputs.changes}}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ needs.check-version.outputs.release-version }}
+
+#  create-release: # replaced with create-tag while v3 is not the main branch
+#    needs: [ check-version, build-sources ]
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          ref: ${{ github.ref }}
+#          fetch-depth: 0
+#
+#      - name: Get previous final release tag
+#        id: previousTag
+#        run: echo "previousTag=$(git --no-pager tag --sort=creatordate --merged ${{ github.ref_name }} | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$" | tail -1)" >> $GITHUB_OUTPUT
+#
+#      - name: Create release note
+#        id: changelog
+#        uses: requarks/changelog-action@v1
+#        with:
+#          fromTag: ${{ github.sha }}
+#          toTag: ${{ steps.previousTag.outputs.previousTag}}
+#          token: ${{ secrets.GITHUB_TOKEN }}
+#          writeToFile: false
+#
+#      - uses: softprops/action-gh-release@v1
+#        with:
+#          tag_name: ${{ needs.check-version.outputs.release-version }}
+#          target_commitish: ${{ github.head_ref || github.ref }}
+#          name: ${{ needs.check-version.outputs.release-version }}
+#          body: ${{steps.changelog.outputs.changes}}
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-docker:
-    needs: [ check-version, create-release ]
+    needs: [ check-version, create-tag ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/gandalf.yml b/.github/workflows/gandalf.yml
@@ -3,7 +3,6 @@ name: Eno V3 test
 on:
   pull_request:
     branches:
-      - 'v3-develop' # temp branch
       - 'v3-main'
     types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore: ['docs/**', 'logo/**', 'Dockerfile', 'README**.md']