Add the ability to do major releases (#831)

kiali · Oct 18, 2024 · 2633307 · 2633307
1 parent eaf4e87
commit 2633307
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,16 +1,17 @@
 name: Release
 
 on:
-  schedule:
+  #schedule:
   # Every Monday at 07:00 (UTC)
-  - cron: '00 7 * * MON'
+  #- cron: '00 7 * * MON'
   workflow_dispatch:
     inputs:
       release_type:
         description: 'Release type'     
         required: true
         type: choice
         options:
+        - major
         - minor
         - patch
       release_branch:
@@ -109,6 +110,9 @@ jobs:
         then
           RELEASE_VERSION=$(python bump.py $RELEASE_TYPE $RELEASE_VERSION)
         elif [[ $RELEASE_TYPE == "minor" ]]
+        then
+          RELEASE_VERSION=$RELEASE_VERSION
+        elif [[ $RELEASE_TYPE == "major" ]]
         then
           RELEASE_VERSION=$RELEASE_VERSION
         fi
@@ -128,6 +132,9 @@ jobs:
         elif [[ $RELEASE_TYPE == "minor" ]]
         then 
             NEXT_VERSION=$(python bump.py $RELEASE_TYPE $RELEASE_VERSION)
+        elif [[ $RELEASE_TYPE == "major" ]]
+        then
+            NEXT_VERSION=$(python bump.py "minor" $RELEASE_VERSION)
         fi
 
         echo "next_version=$NEXT_VERSION" >> $GITHUB_OUTPUT
@@ -209,7 +216,7 @@ jobs:
     - name: Create tag
       run: |
         # Skip OLM metadata for patch releases
-        if [[ $RELEASE_TYPE == "minor" ]]
+        if [[ $RELEASE_TYPE == "minor" || $RELEASE_TYPE == "major" ]]
         then
           VERSION_TO_RELEASE=${RELEASE_VERSION:1}
           DATETIME_NOW="$(date --utc +'%FT%TZ')"
@@ -245,15 +252,15 @@ jobs:
       run: git push origin $(git rev-parse HEAD):refs/heads/$BRANCH_VERSION
 
     - name: Configure Operator SDK
-      if: ${{ needs.initialize.outputs.release_type == 'minor' }}
+      if: ${{ needs.initialize.outputs.release_type == 'minor' || needs.initialize.outputs.release_type == 'major' }}
       run: |
         make get-operator-sdk
 
     - name: Create a PR to prepare for next version
       env:
         BUILD_TAG: kiali-operator-release-${{ github.run_number }}-main
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      if: ${{ needs.initialize.outputs.release_type == 'minor' }}
+      if: ${{ needs.initialize.outputs.release_type == 'minor' || needs.initialize.outputs.release_type == 'major' }}
       run: |
         export PATH="$PATH:$GITHUB_WORKSPACE/_output/operator-sdk-install"
 

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ OUTDIR=${ROOTDIR}/_output
 TARGET_ARCHS ?= amd64 arm64 s390x ppc64le
 
 # Identifies the current build.
-VERSION ?= v1.90.0-SNAPSHOT
+VERSION ?= v2.0.0-SNAPSHOT
 COMMIT_HASH ?= $(shell git rev-parse HEAD)
 
 # Identifies the Kiali operator container image that will be built