Merge branch 'main' into feature-better-auth

.github/workflows/copilot-build.yml → .github/workflows/copilot-build-backend.yml

@@ -1,17 +1,21 @@
-name: copilot-build
+name: copilot-build-backend
 
 on:
+  pull_request:
+    branches: ["main"]
+  merge_group:
+    branches: ["main"]
   workflow_call:
     outputs:
       artifact:
         description: "The name of the uploaded artifact."
-        value: ${{jobs.web-api.outputs.artifact}}
+        value: ${{jobs.webapi.outputs.artifact}}
 
 permissions:
   contents: read
 
 jobs:
-  web-api:
+  webapi:
     strategy:
       fail-fast: false
       matrix:
@@ -33,7 +37,12 @@ jobs:
 
       - name: Package Copilot Chat WebAPI
         run: |
-          deploy\package-webapi.ps1 -Configuration Release -DotnetFramework net6.0 -TargetRuntime win-x64 -OutputDirectory ${{ github.workspace }}\deploy
+          scripts\deploy\package-webapi.ps1 -Configuration Release -DotnetFramework net6.0 -TargetRuntime win-x64 -OutputDirectory ${{ github.workspace }}\scripts\deploy
+
+      - name: Check formatting of Copilot Chat WebAPI
+        run: |
+          cd webapi/
+          dotnet format --verify-no-changes --verbosity diagnostic
 
       - name: Set version tag
         id: versiontag
@@ -46,7 +55,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: copilotchat-webapi-${{ steps.versiontag.outputs.versiontag }}
-          path: ${{ github.workspace }}\deploy\out\webapi.zip
+          path: ${{ github.workspace }}\scripts\deploy\out\webapi.zip
 
       - name: "Set outputs"
         id: artifactoutput

.github/workflows/copilot-build-frontend.yml

@@ -0,0 +1,33 @@
+name: copilot-build-frontend
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: ["main"]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  webapp:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "yarn"
+          cache-dependency-path: "webapp/yarn.lock"
+
+      - name: Run yarn install, yarn build, & yarn format
+        run: |
+          #!/bin/bash
+          set -e # exit with nonzero exit code if anything fails
+          echo "Running yarn install, yarn build, & yarn format"
+          yarn install --frozen-lockfile # install dependencies and ensure lockfile is unchanged.
+          yarn build # run build script
+          yarn format # run format script
+        working-directory: webapp

.github/workflows/copilot-deploy-backend.yml

@@ -24,7 +24,7 @@ permissions:
   contents: read
 
 jobs:
-  web-api:
+  webapi:
     environment: ${{inputs.ENVIRONMENT}}
     permissions:
       id-token: write

.github/workflows/copilot-deploy-frontend.yml

@@ -1,4 +1,4 @@
-name: copilot-deploy-backend
+name: copilot-deploy-frontend
 
 on:
   workflow_call:
@@ -23,7 +23,7 @@ permissions:
   contents: read
 
 jobs:
-  web-app:
+  webapp:
     environment: ${{inputs.ENVIRONMENT}}
     permissions:
       id-token: write

.github/workflows/copilot-deploy-pipeline.yml

@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   build:
-    uses: ./.github/workflows/copilot-build.yml
+    uses: ./.github/workflows/copilot-build-backend.yml
 
   int:
     needs: build

.github/workflows/copilot-chat-tests.yml → .github/workflows/copilot-test-e2e.yml

@@ -8,7 +8,7 @@ permissions:
   contents: read
 
 jobs:
-  test:
+  e2e:
     defaults:
       run:
         working-directory: webapp