force release and promote

centreon · Jun 20, 2024 · eac2020 · eac2020
1 parent 0e92ba6
commit eac2020
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
@@ -237,7 +237,7 @@ runs:
         done
 
         # Build JSON structure with released versions
-        JSON_TAGS=$(jq -n '{componentList:$ARGS.positional}' --args "${NEW_RELEASE_TAGS[@]}")
+        JSON_TAGS=$(jq -n '{componentList:$ARGS.positional}' --args "${NEW_STABLE_TAGS[@]}")
         JSON_VERSION_INFO=$(jq -n --arg majorVersion "$MAJOR_VERSION" --arg scopeVersion "$SCOPE_VERSION" '$ARGS.named' )
         RELEASE_JSON=$(echo "$JSON_VERSION_INFO" | jq -c --argjson json_tags "$JSON_TAGS" '. += $json_tags')
 

diff --git a/.github/workflows/centreon-collect.yml b/.github/workflows/centreon-collect.yml
@@ -163,7 +163,7 @@ jobs:
 
   promote:
     needs: [get-version]
-    if: ${{ contains(fromJson('["stable"]'), needs.get-version.outputs.stability) && github.event_name != 'workflow_dispatch' }}
+    if: ${{ contains(fromJson('["stable"]'), needs.get-version.outputs.stability) }}
     runs-on: [self-hosted, common]
     strategy:
       matrix:

diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml
@@ -84,7 +84,12 @@ jobs:
           GITHUB_RELEASE_TYPE=$(echo $BRANCHNAME |cut -d '-' -f 1)
 
           case "$BRANCHNAME" in
-            master | [2-9][0-9].[0-9][0-9].x)
+            master)
+              echo "release=1" >> $GITHUB_OUTPUT
+              echo "release_cloud=1" >> $GITHUB_OUTPUT
+              echo "release_type=$GITHUB_RELEASE_TYPE" >> $GITHUB_OUTPUT
+              ;;
+            [2-9][0-9].[0-9][0-9].x|23.04.x-tun)
               echo "release=1" >> $GITHUB_OUTPUT
               echo "release_cloud=$GITHUB_RELEASE_CLOUD" >> $GITHUB_OUTPUT
               echo "release_type=$GITHUB_RELEASE_TYPE" >> $GITHUB_OUTPUT
@@ -132,7 +137,7 @@ jobs:
               STABILITY="testing"
               ENV="testing"
               ;;
-            master | [2-9][0-9].[0-9][0-9].x)
+            master | [2-9][0-9].[0-9][0-9].x | 23.04.x-tun)
               STABILITY="stable"
               ENV="production"
               ;;

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,20 +20,20 @@ on:
 
 jobs:
   release:
-    if: ${{ github.event.pull_request.merged == true }}
+    #if: ${{ github.event.pull_request.merged == true }}
     runs-on: ubuntu-22.04
     steps:
       - name: Check base_ref
         run: |
           set -eu
           # Check if github.base_ref is either master or any of the supported version ones
           # This must never run on any other than master and supported version base_ref
-          if [[ "${{ github.base_ref }}" == 'master' || "${{ github.base_ref }}" =~ ^[2-9][0-9].[0-9][0-9].x ]];then
-            echo "[DEBUG] base_ref is valid: ${{ github.base_ref }}"
-          else
-            echo "::error::base_ref is not valid (${{ github.base_ref }}), exiting."
-            exit 1
-          fi
+          # if [[ "${{ github.base_ref }}" == 'master' || "${{ github.base_ref }}" =~ ^[2-9][0-9].[0-9][0-9].x ]];then
+          #   echo "[DEBUG] base_ref is valid: ${{ github.base_ref }}"
+          # else
+          #   echo "::error::base_ref is not valid (${{ github.base_ref }}), exiting."
+          #   exit 1
+          # fi
         shell: bash
 
       - name: Checkout sources
@@ -45,7 +45,7 @@ jobs:
         id: release
         uses: ./.github/actions/release
         with:
-          github_ref_name: ${{ github.base_ref }}
+          github_ref_name: "23.10.x"
           jira_project_id: ${{ secrets.JIRA_PROJECT_ID }}
           jira_user_email: ${{ secrets.XRAY_JIRA_USER_EMAIL }}
           jira_api_token: ${{ secrets.XRAY_JIRA_TOKEN }}