try again

Author: CFsylvester

.github/workflows/ci.yml

@@ -11,80 +11,66 @@ on:
 
 jobs:
   check-main-override:
-  runs-on: ubuntu-latest
-  steps:
-    - name: 🛑 Block direct pushes to main (unless override flag)
-      run: |
-        echo "🔍 Checking push context: ${{ github.event_name }} → ${{ github.ref }}"
-        if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
-          if [[ "${{ github.event.head_commit.message }}" != *"[override-main]"* ]]; then
-            echo "❌ Direct push to main is blocked. Use a PR or include [override-main] in your commit message."
-            exit 1
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🛑 Block direct pushes to main (unless override flag)
+        run: |
+          echo "🔍 Event: ${{ github.event_name }} | Ref: ${{ github.ref }}"
+          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
+            COMMIT_MSG="${{ github.event.head_commit.message }}"
+            echo "🔍 Commit message: $COMMIT_MSG"
+            if [[ "$COMMIT_MSG" != *"[override-main]"* ]]; then
+              echo "❌ Direct push to main is blocked. Use a PR or include [override-main] in your commit message."
+              exit 1
+            else
+              echo "✅ Override flag found. Proceeding."
+            fi
           else
-            echo "✅ Override flag found. Allowing push to main."
+            echo "ℹ️ Not a direct push to main. Proceeding."
           fi
-        else
-          echo "ℹ️ Not a direct push to main. Skipping protection."
-        fi
 
   lint:
     name: 🔍 Lint
     runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/main' || github.event_name != 'push' || needs.check-main-override.result == 'success'
-    needs: [check-main-override]
+    needs: check-main-override
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: yarn
-
-      - name: 📦 Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Run Linter
-        run: yarn lint
+      - run: yarn install --frozen-lockfile
+      - run: yarn lint
 
   typecheck:
     name: ✅ Type Check
     runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/main' || github.event_name != 'push' || needs.check-main-override.result == 'success'
-    needs: [check-main-override]
+    needs: check-main-override
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: yarn
-
-      - name: 📦 Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Run TypeScript
-        run: yarn typecheck
+      - run: yarn install --frozen-lockfile
+      - run: yarn typecheck
 
   build:
     name: 🔨 Build
     runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/main' || github.event_name != 'push' || needs.check-main-override.result == 'success'
-    needs: [check-main-override]
+    needs: check-main-override
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: yarn
-
-      - name: 📦 Install dependencies
-        run: yarn install --frozen-lockfile
-
+      - run: yarn install --frozen-lockfile
       - name: ⚡ Cache .next build
         uses: actions/cache@v4
         with:
           path: .next
           key: next-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             next-${{ runner.os }}-
-
-      - name: Build App
-        run: yarn build
+      - run: yarn build