build(repo): External contributor CI updates (#3145)

* build(repo): External contributor CI updates * chore(repo): Revert remove Clerk members check
clerk · Apr 9, 2024 · 2cabc27 · 2cabc27
1 parent 1ac6f4b
commit 2cabc27
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 32 deletions.
diff --git a/.changeset/soft-bees-bathe.md b/.changeset/soft-bees-bathe.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,21 +16,19 @@ jobs:
   formatting-linting:
     name: Formatting, linting & changeset checks
     runs-on: ${{ vars.RUNNER_LARGE }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
 
     env:
       TURBO_SUMMARIZE: false
 
     steps:
       - name: Checkout Repo
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           show-progress: false
 
       - name: Setup
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         id: config
         uses: ./.github/actions/init
         with:
@@ -44,7 +42,6 @@ jobs:
         shell: bash
 
       - name: Require Changeset
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         if: ${{ !(github.event_name == 'merge_group') }}
         run: if [ "${{ github.event.pull_request.user.login }}" = "clerk-cookie" ]; then echo 'Skipping' && exit 0; else npx changeset status --since=origin/main; fi
 
@@ -53,28 +50,22 @@ jobs:
         shell: bash
 
       - name: Check Formatting
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         run: npm run format:check
 
       - name: Build Packages
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         run: npx turbo build $TURBO_ARGS --only
 
       - name: Lint packages using publint
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         run: npx turbo lint:publint $TURBO_ARGS --only
 
       - name: Lint types using attw
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         run: npx turbo lint:attw $TURBO_ARGS --filter=!nextjs --filter=!elements --filter=!backend --only
 
       - name: Lint types using attw [Errors Allowed]
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         run: npx turbo lint:attw $TURBO_ARGS --filter=nextjs --filter=backend --filter=elements --continue --only
-        continue-on-error: true  # TODO: Remove this when all related errors are fixed
+        continue-on-error: true # TODO: Remove this when all related errors are fixed
 
       - name: Run lint
-        timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
         run: npx turbo lint $TURBO_ARGS --only -- --quiet
 
       - name: Upload Turbo Summary
@@ -90,14 +81,14 @@ jobs:
     name: Unit Tests
     needs: formatting-linting
     runs-on: ${{ vars.RUNNER_LARGE }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
 
     env:
       TURBO_SUMMARIZE: false
 
     strategy:
       matrix:
-        node-version: [ 18, 20 ]
+        node-version: [18, 20]
 
     steps:
       - name: Checkout Repo
@@ -134,12 +125,12 @@ jobs:
     name: Integration Tests
     needs: formatting-linting
     runs-on: ${{ vars.RUNNER_MEDIUM }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
 
     strategy:
       matrix:
-        test-name: [ 'generic', 'nextjs', 'express', 'quickstart', 'ap-flows' ]
-        test-project: [ 'chrome' ]
+        test-name: ['generic', 'nextjs', 'express', 'quickstart', 'ap-flows']
+        test-project: ['chrome']
 
     steps:
       - name: Checkout Repo

diff --git a/.github/workflows/e2e-cleanups.yml b/.github/workflows/e2e-cleanups.yml
@@ -3,13 +3,13 @@ on:
   workflow_dispatch:
   schedule:
     # run every 6 hours on every weekday
-    - cron: "0 */6 * * 1-5"
+    - cron: '0 */6 * * 1-5'
 
 jobs:
   integration-tests:
     name: Cleanup e2e instances
     runs-on: ${{ vars.RUNNER_NORMAL }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
 
     steps:
       - name: Checkout Repo

diff --git a/.github/workflows/lock-threads.yml b/.github/workflows/lock-threads.yml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   action:
-    timeout-minutes: ${{  fromJSON(vars.TIMEOUT_MINUTES_SHORT) }}
+    timeout-minutes: 3
     runs-on: ${{ vars.RUNNER_NORMAL }}
     steps:
       - uses: actions/stale@v9

diff --git a/.github/workflows/nightly-checks.yml b/.github/workflows/nightly-checks.yml
@@ -8,11 +8,11 @@ jobs:
   integration-tests:
     name: Integration Tests
     runs-on: ${{ vars.RUNNER_NORMAL }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
 
     strategy:
       matrix:
-        test-name: [ 'nextjs' ]
+        test-name: ['nextjs']
 
     steps:
       - name: Checkout Repo

diff --git a/.github/workflows/preview.retheme.yml b/.github/workflows/preview.retheme.yml
@@ -17,7 +17,7 @@ concurrency:
 jobs:
   preview:
     runs-on: ${{ vars.RUNNER_NORMAL }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
     permissions:
       contents: write
       pull-requests: write
@@ -32,7 +32,7 @@ jobs:
           turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
           turbo-team: ${{ vars.TURBO_TEAM }}
           turbo-token: ${{ secrets.TURBO_TOKEN }}
-          registry-url: "https://registry.npmjs.org"
+          registry-url: 'https://registry.npmjs.org'
 
       - name: Build packages
         run: npx turbo build $TURBO_ARGS

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -16,14 +16,16 @@ jobs:
   preview:
     if: ${{ startsWith(github.event.comment.body, '!preview') && github.repository == 'clerk/javascript' && github.event.issue.pull_request }}
     runs-on: ${{ vars.RUNNER_NORMAL }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
 
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_CLERK_PROD_ORG_ID }}
       VERCEL_PROJECT_ID: ${{ secrets.VERCEL_JS_PREVIEW_PROJECT_ID }}
+
     permissions:
       contents: write
       pull-requests: write
+
     steps:
       - name: Limit action to Clerk members
         uses: actions/github-script@v6
@@ -53,7 +55,7 @@ jobs:
           turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
           turbo-team: ${{ vars.TURBO_TEAM }}
           turbo-token: ${{ secrets.TURBO_TOKEN }}
-          registry-url: "https://registry.npmjs.org"
+          registry-url: 'https://registry.npmjs.org'
 
       - name: Build packages
         run: npx turbo build $TURBO_ARGS

diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml
@@ -14,7 +14,7 @@ jobs:
   canary-release:
     if: ${{ github.repository == 'clerk/javascript' }}
     runs-on: ${{ vars.RUNNER_NORMAL }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_TEAM: ${{ vars.TURBO_TEAM }}
@@ -34,7 +34,7 @@ jobs:
           turbo-team: ${{ vars.TURBO_TEAM }}
           turbo-token: ${{ secrets.TURBO_TOKEN }}
           playwright-enabled: true # Must be present to enable caching on branched workflows
-          registry-url: "https://registry.npmjs.org"
+          registry-url: 'https://registry.npmjs.org'
 
       - name: Version packages for canary
         id: version-packages

diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml
@@ -13,7 +13,7 @@ jobs:
   snapshot-release:
     if: ${{ startsWith(github.event.comment.body, '!snapshot') && github.repository == 'clerk/javascript' && github.event.issue.pull_request }}
     runs-on: ${{ vars.RUNNER_LARGE }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
 
     permissions:
       contents: read
@@ -48,7 +48,7 @@ jobs:
           turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
           turbo-team: ${{ vars.TURBO_TEAM }}
           turbo-token: ${{ secrets.TURBO_TOKEN }}
-          registry-url: "https://registry.npmjs.org"
+          registry-url: 'https://registry.npmjs.org'
 
       - name: Extract snapshot name
         id: extract-snapshot-name

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
     name: Release
     if: ${{ github.repository == 'clerk/javascript' }}
     runs-on: ${{ vars.RUNNER_NORMAL }}
-    timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_NORMAL) }}
+    timeout-minutes: 10
 
     permissions:
       contents: write
@@ -55,7 +55,7 @@ jobs:
         id: changesets
         uses: changesets/action@v1
         with:
-          commit: "chore(repo): Version packages"
+          commit: 'chore(repo): Version packages'
           publish: npm run release
           # Workaround for https://github.com/changesets/changesets/issues/421
           version: npm run version
@@ -116,7 +116,7 @@ jobs:
 
     strategy:
       matrix:
-        version: [ 20 ] # NOTE: 18 is cached in the main release workflow
+        version: [20] # NOTE: 18 is cached in the main release workflow
 
     steps:
       - name: Checkout Repo