adjust release flow (#618)

JannikSt · web-flow · commit 725e8e39a2fe · 2025-07-08T15:30:56.000+02:00
diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml
@@ -3,7 +3,7 @@ name: Development Release
 on:
   push:
     branches:
-      - develop
+      - main 
     tags-ignore:
       - '*'
 
diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml
@@ -0,0 +1,58 @@
+name: Release on Demand
+
+on:
+  workflow_dispatch:
+    inputs:
+      bump:
+        description: 'Version bump type'
+        required: true
+        default: 'patch'
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  release:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          
+      - name: Bump version and create tag
+        id: bump
+        run: |
+          # Get current version
+          CURRENT=$(grep '^version =' Cargo.toml | head -n 1 | cut -d '"' -f 2)
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT"
+          
+          # Bump version
+          case "${{ github.event.inputs.bump }}" in
+            major) ((MAJOR++)); MINOR=0; PATCH=0 ;;
+            minor) ((MINOR++)); PATCH=0 ;;
+            patch) ((PATCH++)) ;;
+          esac
+          
+          NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}"
+          
+          # Update Cargo.toml
+          sed -i "s/version = \".*\"/version = \"${NEW_VERSION}\"/" Cargo.toml
+          
+          # Commit and tag
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add Cargo.toml
+          git commit -m "chore: release v${NEW_VERSION}"
+          git push
+          
+          # Create tag (this triggers prod release)
+          git tag -a "v${NEW_VERSION}" -m "Release v${NEW_VERSION}"
+          git push origin "v${NEW_VERSION}"
+          
+          echo "Released version v${NEW_VERSION}"
diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml
@@ -2,10 +2,8 @@ name: Production Release
 
 on:
   push:
-    branches:
-      - main
-    tags-ignore:
-      - '*'
+    tags:
+      - 'v*'
 
 permissions:
   contents: write
@@ -22,32 +20,16 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get version from Cargo.toml
+      - name: Get version from tag
         id: get_version
         run: |
-          VERSION=$(grep '^version =' Cargo.toml | head -n 1 | cut -d '"' -f 2)
+          # Get the tag that triggered this workflow
+          TAG_NAME="${{ github.ref_name }}"
+          VERSION="${TAG_NAME#v}"  # Remove 'v' prefix
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "tag_name=v${VERSION}" >> $GITHUB_OUTPUT
-
-      - name: Check if tag exists
-        id: check_tag
-        run: |
-          if git rev-parse "v${{ steps.get_version.outputs.version }}" >/dev/null 2>&1; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Create and push tag
-        if: steps.check_tag.outputs.exists == 'false'
-        run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git tag -a "v${{ steps.get_version.outputs.version }}" -m "Release v${{ steps.get_version.outputs.version }}"
-          git push origin "v${{ steps.get_version.outputs.version }}"
+          echo "tag_name=${TAG_NAME}" >> $GITHUB_OUTPUT
 
       - name: Install Rust toolchain
-        if: steps.check_tag.outputs.exists == 'false'
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
@@ -56,13 +38,11 @@ jobs:
       - name: Build all workspace members
         env:
           WORKER_RPC_URL: https://sepolia.base.org
-        if: steps.check_tag.outputs.exists == 'false'
         run: |
           export CARGO_BUILD_JOBS=$(nproc)
           cargo build --release --workspace --features testnet
 
       - name: Prepare binaries
-        if: steps.check_tag.outputs.exists == 'false'
         run: |
           mkdir -p release-artifacts
           for binary in worker validator orchestrator discovery; do
@@ -72,7 +52,6 @@ jobs:
           done
 
       - name: Generate checksums
-        if: steps.check_tag.outputs.exists == 'false'
         run: |
           cd release-artifacts
           for file in *-linux-x86_64; do
@@ -83,21 +62,20 @@ jobs:
           cd ..
 
       - name: Create Release
-        if: steps.check_tag.outputs.exists == 'false'
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: v${{ steps.get_version.outputs.version }}
-          name: Release v${{ steps.get_version.outputs.version }}
+          tag_name: ${{ steps.get_version.outputs.tag_name }}
+          name: Release ${{ steps.get_version.outputs.tag_name }}
           body: |
-            🚀 Production Release v${{ steps.get_version.outputs.version }}
+            🚀 Production Release ${{ steps.get_version.outputs.tag_name }}
             
             ⚠️ Currently using testnet configuration
             
             Platform:
             - Linux x86_64
             
             Components:
-            - worker
+            - Worker
             - Validator
             - Orchestrator
             - Discovery service
@@ -121,74 +99,65 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Authenticate to Google Cloud
-        if: steps.check_tag.outputs.exists == 'false'
         uses: google-github-actions/auth@v1
         with:
           credentials_json: ${{ secrets.GCP_SA_KEY }}
       
       - name: Set up Google Cloud SDK
-        if: steps.check_tag.outputs.exists == 'false'
         uses: google-github-actions/setup-gcloud@v1
       
       - name: Configure Docker for Artifact Registry
-        if: steps.check_tag.outputs.exists == 'false'
         run: |
           gcloud auth configure-docker us-east1-docker.pkg.dev
 
       - name: Set up Docker Buildx
-        if: steps.check_tag.outputs.exists == 'false'
         uses: docker/setup-buildx-action@v2
 
       - name: Login to GitHub Container Registry
-        if: steps.check_tag.outputs.exists == 'false'
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate Docker metadata
-        if: steps.check_tag.outputs.exists == 'false'
         id: meta
         run: |
           REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
           echo "repo_lower=${REPO_LOWER}" >> $GITHUB_OUTPUT
 
       - name: Build and push Discovery image
-        if: steps.check_tag.outputs.exists == 'false'
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./crates/discovery/Dockerfile
           push: true
           tags: |
             ghcr.io/${{ steps.meta.outputs.repo_lower }}/discovery:latest
-            ghcr.io/${{ steps.meta.outputs.repo_lower }}/discovery:v${{ steps.get_version.outputs.version }}
+            ghcr.io/${{ steps.meta.outputs.repo_lower }}/discovery:${{ steps.get_version.outputs.tag_name }}
             us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/discovery:latest
-            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/discovery:v${{ steps.get_version.outputs.version }}
+            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/discovery:${{ steps.get_version.outputs.tag_name }}
 
       - name: Build and push Validator image
-        if: steps.check_tag.outputs.exists == 'false'
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./crates/validator/Dockerfile
           push: true
           tags: |
             ghcr.io/${{ steps.meta.outputs.repo_lower }}/validator:latest
-            ghcr.io/${{ steps.meta.outputs.repo_lower }}/validator:v${{ steps.get_version.outputs.version }}
+            ghcr.io/${{ steps.meta.outputs.repo_lower }}/validator:${{ steps.get_version.outputs.tag_name }}
             us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/validator:latest
-            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/validator:v${{ steps.get_version.outputs.version }}
+            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/validator:${{ steps.get_version.outputs.tag_name }}
 
       - name: Build and push Orchestrator image
-        if: steps.check_tag.outputs.exists == 'false'
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ./crates/orchestrator/Dockerfile
           push: true
           tags: |
             ghcr.io/${{ steps.meta.outputs.repo_lower }}/orchestrator:latest
-            ghcr.io/${{ steps.meta.outputs.repo_lower }}/orchestrator:v${{ steps.get_version.outputs.version }}
+            ghcr.io/${{ steps.meta.outputs.repo_lower }}/orchestrator:${{ steps.get_version.outputs.tag_name }}
             us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/orchestrator:latest
-            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/orchestrator:v${{ steps.get_version.outputs.version }}
+            us-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/prime-protocol/orchestrator:${{ steps.get_version.outputs.tag_name }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
