Merge pull request #44 from upstat-io/dev

elucidsoft · web-flow · commit 8fdecb742723 · 2026-02-27T09:13:12.000-05:00
feat(ci): CalVer releases, fix duplicate CI/deploy runs
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
@@ -1,27 +1,28 @@
 name: Auto Release
 
-# Automatically bump version, tag, and trigger release on every merge to master.
-# During alpha, every PR merge gets its own release (alpha.N → alpha.N+1).
+# Automatically tag and release on every merge to master.
+# Uses CalVer: v2026.02.27.N-alpha (UTC date + daily build counter).
+# No commits to master — just tags the merge commit directly.
 
 on:
   push:
     branches: [master]
 
+# Change to "beta" or remove for stable releases.
+env:
+  PRERELEASE_SUFFIX: alpha
+
 # Queue releases — don't cancel in-progress ones.
-# Each merge gets its own version bump, processed sequentially.
+# Each merge gets its own tag, processed sequentially.
 concurrency:
   group: auto-release
   cancel-in-progress: false
 
 jobs:
   auto-release:
-    name: Bump Version & Tag
+    name: Tag & Release
     runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    # Skip release commits to prevent infinite loop.
-    # The version bump commit starts with "chore: release v".
-    if: "!startsWith(github.event.head_commit.message, 'chore: release v')"
+    timeout-minutes: 5
 
     steps:
       - name: Checkout
@@ -31,58 +32,39 @@ jobs:
           fetch-depth: 0
           ref: master
 
-      - name: Configure git
+      - name: Derive release tag
+        id: tag
         run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
+          TODAY=$(date -u +"%Y.%m.%d")
+          COUNT=1
+          while git rev-parse "refs/tags/v${TODAY}.${COUNT}-${PRERELEASE_SUFFIX}" &>/dev/null; do
+            COUNT=$((COUNT + 1))
+          done
+          TAG="v${TODAY}.${COUNT}-${PRERELEASE_SUFFIX}"
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
+          echo "Release tag: $TAG"
 
-      - name: Determine version
-        id: version
+      - name: Push tag
         run: |
-          CURRENT=$(grep -E '^version\s*=' Cargo.toml | head -1 | sed 's/.*=\s*"\([^"]*\)".*/\1/')
-          echo "current=$CURRENT" >> $GITHUB_OUTPUT
-
-          if git rev-parse "refs/tags/v$CURRENT" &>/dev/null; then
-            # Tag exists — auto-increment
-            echo "Tag v$CURRENT already exists, auto-incrementing..."
-            echo "bumped=true" >> $GITHUB_OUTPUT
-          else
-            # Tag doesn't exist — version was set manually in a PR, or first release
-            echo "Tag v$CURRENT does not exist, using current version as-is"
-            echo "bumped=false" >> $GITHUB_OUTPUT
-            echo "new_version=$CURRENT" >> $GITHUB_OUTPUT
-          fi
+          git tag "${{ steps.tag.outputs.tag }}"
+          git push origin "${{ steps.tag.outputs.tag }}"
 
-      - name: Bump version
-        if: steps.version.outputs.bumped == 'true'
-        run: ./scripts/release.sh --yes
-
-      - name: Read new version
-        id: new_version
+      - name: Create release with notes
+        env:
+          GH_TOKEN: ${{ secrets.ORILANG_RELEASE_TOKEN }}
         run: |
-          VERSION=$(grep -E '^version\s*=' Cargo.toml | head -1 | sed 's/.*=\s*"\([^"]*\)".*/\1/')
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "New version: $VERSION"
+          TAG="${{ steps.tag.outputs.tag }}"
 
-      - name: Regenerate lockfiles
-        if: steps.version.outputs.bumped == 'true'
-        run: |
-          cargo generate-lockfile
-          cargo generate-lockfile --manifest-path compiler/ori_llvm/Cargo.toml
-          cargo generate-lockfile --manifest-path compiler/ori_rt/Cargo.toml
-          cargo generate-lockfile --manifest-path tools/ori-lsp/Cargo.toml
-          cargo generate-lockfile --manifest-path website/playground-wasm/Cargo.toml
+          # Find previous tag for release notes range
+          PREV_TAG=$(git tag --sort=-creatordate | grep '^v' | sed -n '2p')
 
-      - name: Commit version bump
-        if: steps.version.outputs.bumped == 'true'
-        run: |
-          git add -A
-          git commit -m "chore: release v${{ steps.new_version.outputs.version }}"
+          NOTES_ARGS=""
+          if [[ -n "$PREV_TAG" ]]; then
+            NOTES_ARGS="--notes-start-tag $PREV_TAG"
+          fi
 
-      - name: Tag and push
-        run: |
-          git tag "v${{ steps.new_version.outputs.version }}"
-          git push origin master --tags
+          gh release create "$TAG" \
+            --title "Ori ${TAG#v}" \
+            --generate-notes \
+            $NOTES_ARGS \
+            --prerelease
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,6 +19,7 @@ jobs:
   # Fast checks - run first, fail fast
   version-check:
     name: Version Sync
+    if: "!startsWith(github.event.head_commit.message, 'chore: release v')"
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -28,6 +29,7 @@ jobs:
 
   format:
     name: Format
+    if: "!startsWith(github.event.head_commit.message, 'chore: release v')"
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -40,6 +42,7 @@ jobs:
 
   clippy:
     name: Clippy
+    if: "!startsWith(github.event.head_commit.message, 'chore: release v')"
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -55,6 +58,7 @@ jobs:
   # Main test suite
   test:
     name: Test
+    if: "!startsWith(github.event.head_commit.message, 'chore: release v')"
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -182,6 +186,7 @@ jobs:
   # TODO: Make this blocking once LLVM backend is stable
   llvm:
     name: LLVM Backend
+    if: "!startsWith(github.event.head_commit.message, 'chore: release v')"
     runs-on: ubuntu-latest
     timeout-minutes: 60
     continue-on-error: true  # Non-blocking during pre-alpha
@@ -246,7 +251,7 @@ jobs:
     name: CI Success
     needs: [version-check, format, clippy, test, cross-platform]
     runs-on: ubuntu-latest
-    if: always()
+    if: "always() && !startsWith(github.event.head_commit.message, 'chore: release v')"
     steps:
       - name: Check all jobs passed
         run: |
diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml
@@ -6,6 +6,9 @@ on:
     workflows: ["CI"]
     types: [completed]
     branches: [master]
+  # Deploy directly on release commits (CI is skipped for these, but website needs version update)
+  push:
+    branches: [master]
   workflow_dispatch:
 
 permissions:
@@ -20,6 +23,13 @@ concurrency:
 
 jobs:
   build:
+    # push: only for release commits (CI is skipped, but website needs the version)
+    # workflow_run: only when CI succeeded (not when skipped for release commits)
+    # workflow_dispatch: always
+    if: >-
+      (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'chore: release v')) ||
+      (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') ||
+      github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,34 +36,6 @@ jobs:
           fi
           echo "Tag is on master branch - OK"
 
-      - name: Extract expected version from tag
-        id: tag_version
-        run: |
-          # Remove 'v' prefix from tag
-          TAG_VERSION="${GITHUB_REF_NAME#v}"
-          echo "tag_version=$TAG_VERSION" >> $GITHUB_OUTPUT
-          echo "Tag version: $TAG_VERSION"
-
-      - name: Extract Cargo.toml version
-        id: cargo_version
-        run: |
-          CARGO_VERSION=$(grep -E '^version\s*=' Cargo.toml | head -1 | sed 's/.*=\s*"\([^"]*\)".*/\1/')
-          echo "cargo_version=$CARGO_VERSION" >> $GITHUB_OUTPUT
-          echo "Cargo.toml version: $CARGO_VERSION"
-
-      - name: Validate tag matches Cargo.toml
-        run: |
-          if [[ "${{ steps.tag_version.outputs.tag_version }}" != "${{ steps.cargo_version.outputs.cargo_version }}" ]]; then
-            echo "ERROR: Tag version (${{ steps.tag_version.outputs.tag_version }}) does not match Cargo.toml version (${{ steps.cargo_version.outputs.cargo_version }})"
-            echo ""
-            echo "To fix:"
-            echo "  1. Delete the tag: git tag -d ${{ github.ref_name }} && git push origin :refs/tags/${{ github.ref_name }}"
-            echo "  2. Update versions: ./scripts/release.sh ${{ steps.tag_version.outputs.tag_version }}"
-            echo "  3. Commit, tag, and push again"
-            exit 1
-          fi
-          echo "Version validation passed!"
-
       - name: Check version synchronization
         run: ./scripts/sync-version.sh --check
 
@@ -90,8 +62,16 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Derive build number
-        run: ./scripts/bump-build.sh
+      - name: Derive build number from tag
+        run: |
+          # Extract CalVer build number from tag: v2026.02.27.2-alpha → 2026.02.27.2
+          BUILD=$(echo "${GITHUB_REF_NAME}" | grep -oE '[0-9]{4}\.[0-9]{2}\.[0-9]{2}\.[0-9]+')
+          if [[ -n "$BUILD" ]]; then
+            echo "$BUILD" > BUILD_NUMBER
+          else
+            ./scripts/bump-build.sh  # Fallback for semver tags
+          fi
+          echo "Build number: $(cat BUILD_NUMBER)"
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -149,8 +129,16 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Derive build number
-        run: ./scripts/bump-build.sh
+      - name: Derive build number from tag
+        run: |
+          # Extract CalVer build number from tag: v2026.02.27.2-alpha → 2026.02.27.2
+          BUILD=$(echo "${GITHUB_REF_NAME}" | grep -oE '[0-9]{4}\.[0-9]{2}\.[0-9]{2}\.[0-9]+')
+          if [[ -n "$BUILD" ]]; then
+            echo "$BUILD" > BUILD_NUMBER
+          else
+            ./scripts/bump-build.sh  # Fallback for semver tags
+          fi
+          echo "Build number: $(cat BUILD_NUMBER)"
 
       - name: Install LLVM
         run: |
@@ -302,58 +290,12 @@ jobs:
             echo "This is a stable release"
           fi
 
-      - name: Generate release body
-        run: |
-          VERSION="${GITHUB_REF_NAME#v}"
-          if [[ "$VERSION" == *"alpha"* ]]; then
-            cat << 'BODY' > release_body.md
-          ## ⚠️ Nightly Release
-
-          This is an **alpha/nightly** build intended for testing and development.
-          It may contain bugs and breaking changes.
-
-          ### Installation
-
-          **Quick install (Linux/macOS):**
-          ```bash
-          curl -fsSL https://ori-lang.com/install.sh | sh
-          ```
-
-          **Manual download:** See assets below for your platform.
-
-          ### What's New
-
-          See the auto-generated changelog below for details.
-
-          ---
-          BODY
-          else
-            cat << 'BODY' > release_body.md
-          ## Installation
-
-          **Quick install (Linux/macOS):**
-          ```bash
-          curl -fsSL https://ori-lang.com/install.sh | sh
-          ```
-
-          **Manual download:** See assets below for your platform.
-
-          ### What's New
-
-          See the auto-generated changelog below for details.
-
-          ---
-          BODY
-          fi
-
-      - name: Create Release
+      - name: Upload artifacts to release
         uses: softprops/action-gh-release@v2
         with:
           name: ${{ steps.release_type.outputs.name }}
-          body_path: release_body.md
           files: |
             artifacts/*
-          generate_release_notes: true
           prerelease: ${{ steps.release_type.outputs.prerelease }}
           make_latest: ${{ steps.release_type.outputs.prerelease != 'true' }}
         env:
