Merge pull request #2 from oaknational/rc

oaknational · Aug 22, 2024 · 613c712 · 613c712
2 parents 67619bb + 0be4f78
commit 613c712
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 40 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -1,11 +1,14 @@
 name: Playwright
 on:
   deployment_status:
+  push:
+    branches:
+      - production
 jobs:
   test-e2e:
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    if: github.event.deployment_status.state == 'success' && contains(github.event.deployment_status.target_url, 'ai-beta-nextjs')
+    if: github.event.deployment_status.state == 'success' && contains(github.event.deployment_status.target_url, 'oak-ai-lesson-assistant')
     steps:
       - uses: actions/checkout@v4
       - name: Setup pnpm
@@ -37,7 +40,7 @@ jobs:
         working-directory: apps/nextjs
         # Only include @openai tests on RC branches
         run: |
-          if [[ "${{ steps.ref_from_sha.outputs.branch_name }}" =~ ^v[0-9\.]+-rc[0-9]+-branch$ ]]; then
+          if [[ "${{ steps.ref_from_sha.outputs.branch_name }}" =~ ^rc$ ]]; then
             pnpm test-e2e
           else
             pnpm test-e2e --grep-invert @openai
@@ -46,7 +49,7 @@ jobs:
           TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
           TEST_USER_EMAIL: ${{ steps.doppler.outputs.TEST_USER_EMAIL }}
           TEST_USER_PASSWORD: ${{ steps.doppler.outputs.TEST_USER_PASSWORD }}
-          VERCEL_AUTOMATION_BYPASS_SECRET: ${{ steps.doppler.outputs.VERCEL_AUTOMATION_BYPASS_SECRET }}
+          VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
           NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: ${{ steps.doppler.outputs.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY }}
           CLERK_SECRET_KEY: ${{ steps.doppler.outputs.CLERK_SECRET_KEY }}
       - name: Upload Playwright report
@@ -65,7 +68,7 @@ jobs:
           message: |
             ### Playwright e2e tests
 
-            [Job summary](https://github.com/oaknational/ai-beta/actions/runs/${{github.run_id}})
+            [Job summary](https://github.com/oaknational/oak-ai-lesson-assistant/actions/runs/${{github.run_id}})
 
             [Download report](${{ steps.upload-report.outputs.artifact-url }})
 

diff --git a/.github/workflows/post_deployment.yml b/.github/workflows/post_deployment.yml
@@ -15,16 +15,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # Note we can't use caching here, because caching needs GITHUB_REF to be defined,
-      # and Vercel deployment_status events set deployment.ref to the SHA, not the triggering
-      # branch or pull request.
-      # https://github.com/actions/cache/issues/319
-      - name: Use Node.js
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 8
+
+      - name: Setup Node 20
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
-          cache: "npm"
-      - run: npm ci
+          node-version: 20
+          cache: "pnpm"
+
+      - name: Install deps (with cache)
+        run: pnpm install
 
       - uses: ./.github/actions/ref_from_sha
         name: Get PR Ref from SHA

diff --git a/packages/core/src/scripts/seedLessons.ts b/packages/core/src/scripts/seedLessons.ts
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,8 +1,8 @@
-sonar.projectKey=oaknational_ai-experiments
+sonar.projectKey=oaknational_oak-ai-lesson-assistant
 sonar.organization=oaknational
 
-sonar.projectName=Oak AI Projects
-sonar.projectVersion=v1.38.0
+sonar.projectName=oak-ai-lesson-assistant
+sonar.projectVersion=v1.41.1
 sonar.projectDescription=Oak National Academy AI Web Application
 sonar.links.homepage=https://labs.thenational.academy/