Merge pull request #330 from algorandfoundation/chore/version-bump-for-council-deploy

fix: semver + council canary versioning

Author: kylebeee

.github/workflows/xgov-council-release.yml

@@ -55,35 +55,60 @@ jobs:
       - name: Extract version from pyproject.toml
         id: extract-version
         run: |
-          VERSION=$(grep '^version = ' pyproject.toml | sed 's/version = "\(.*\)"/\1/')
-          echo "Extracted version from pyproject.toml: $VERSION"
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "tag=council-v$VERSION" >> $GITHUB_OUTPUT
+          BASE_VERSION=$(grep '^version = ' pyproject.toml | sed 's/version = "\(.*\)"/\1/')
+          echo "version=$BASE_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Get next canary number for testnet
+        id: canary-number
+        if: inputs.environment == 'testnet'
+        run: |
+          BASE_VERSION="${{ steps.extract-version.outputs.version }}"
+          CANARY_TAGS=$(git tag -l "council-v${BASE_VERSION}.canary.*" | sort -V)
+          if [ -z "$CANARY_TAGS" ]; then
+            CANARY_NUM=1
+          else
+            LATEST_CANARY=$(echo "$CANARY_TAGS" | tail -1)
+            CANARY_NUM=$(echo "$LATEST_CANARY" | sed "s/council-v${BASE_VERSION}\.canary\.\([0-9]*\)/\1/")
+            CANARY_NUM=$((CANARY_NUM + 1))
+          fi
+          echo "number=$CANARY_NUM" >> $GITHUB_OUTPUT
+
+      - name: Set release tag
+        id: set-tag
+        run: |
+          BASE_VERSION="${{ steps.extract-version.outputs.version }}"
+          if [ "${{ inputs.environment }}" == "testnet" ]; then
+            TAG="council-v${BASE_VERSION}.canary.${{ steps.canary-number.outputs.number }}"
+          else
+            TAG="council-v${BASE_VERSION}-${{ inputs.environment }}"
+          fi
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
+          echo "tag=$TAG" >> $GITHUB_ENV
 
       - name: Create council release tag
         run: |
-          git tag -a "${{ steps.extract-version.outputs.tag }}" -m "Council Release ${{ steps.extract-version.outputs.version }}"
-          git push origin "${{ steps.extract-version.outputs.tag }}"
+          TAG="${{ steps.set-tag.outputs.tag }}"
+          git tag -a "$TAG" -m "Council Release $TAG"
+          git push origin "$TAG"
 
       - name: Create GitHub council release
         uses: softprops/action-gh-release@v2
         with:
           token: ${{ steps.app-token.outputs.token }}
-          tag_name: ${{ steps.extract-version.outputs.tag }}
-          name: Council Release ${{ steps.extract-version.outputs.version }}
+          tag_name: ${{ steps.set-tag.outputs.tag }}
+          name: Council Release ${{ steps.set-tag.outputs.tag }}
           body: |
-            🚀 **Council Contract Release ${{ steps.extract-version.outputs.version }}**
+            🚀 **Council Contract Release ${{ steps.set-tag.outputs.tag }}**
 
-            This is a manual release of the Council contract.
+            This ${{ inputs.environment == 'testnet' && 'canary' || '' }} release has been manually deployed to Algorand ${{ inputs.environment == 'testnet' && 'Testnet' || 'Mainnet' }}
 
             ## Deployment
-            - **Environment**: ${{ inputs.environment }}
             - **Registry App ID**: ${{ inputs.registry_app_id || 'from environment variable' }}
 
             ## Changes
             This release includes the latest Council contract updates.
 
-            **✅ Note**: This release was manually triggered and deployed to ${{ inputs.environment }}.
+            ${{ inputs.environment == 'testnet' && '**⚠️ Note**: This is a canary release for testing purposes. Not suitable for production use.' || '' }}
           draft: false
           prerelease: ${{ inputs.environment == 'testnet' }}
 
@@ -101,8 +126,6 @@ jobs:
       - name: Deploy council to ${{ inputs.environment }}
         run: algokit project deploy ${{ inputs.environment }} council
         env:
-          # Council-specific deployment configuration
-          COUNCIL_DEPLOY_COMMAND: deploy
           # Registry app ID - use input if provided, otherwise fall back to environment variable
           XGOV_REGISTRY_APP_ID: ${{ inputs.registry_app_id || (inputs.environment == 'mainnet' && vars.XGOV_REGISTRY_APP_ID_MAINNET) || (inputs.environment == 'testnet' && vars.XGOV_REGISTRY_APP_ID_TESTNET) || (inputs.environment == 'localnet' && vars.XGOV_REGISTRY_APP_ID_LOCALNET) || '' }}
           # Mainnet Vault configuration for transaction signing

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 package-mode = false
 name = "xgov-beta-sc"
-version = "1.1.1"
+version = "1.1.2"
 description = "Algorand xGov Beta Smart Contracts"
 authors = ["Algorand Foundation <[email protected]>"]
 readme = "README.md"