Merge pull request #8009 from jrjohnson/matrix-deploys-and-test

Improvements to Deploy
ilios · Jul 25, 2024 · 9b21f04 · 9b21f04
2 parents f40b4ea + f302975
commit 9b21f04
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -156,6 +156,32 @@ jobs:
       - name: Build
         run: pnpm --filter ${{matrix.workspace}} run build
 
+  test-deploy-build:
+    name: Test Deploy Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [20]
+        workspace:
+          - frontend
+          - lti-course-manager
+          - lti-dashboard
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: pnpm
+      - name: install dependencies
+        run: pnpm install
+      - name: Test ${{matrix.workspace}} Deploy
+        run: pnpm --filter ${{matrix.workspace}} run deploy:test
+
   sonarqube_scan:
     name: Scan with UCSF SonarQube
     runs-on: ubuntu-latest

diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml
@@ -32,6 +32,14 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           GITHUB_PR_NUMBER: ${{ github.event.number }}
+      - uses: act10ns/slack@v2
+        if: failure()
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ILIOS_DEPLOYMENT_WEBHOOK_URL }}
+        with:
+          status: ${{ job.status }}
+          message: PR ${{ github.event.number }} Deploy Failed {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+
   comment:
     runs-on: ubuntu-latest
     needs: deploy

diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -15,6 +15,12 @@ jobs:
     name: Deploy and Create Sentry Release
     runs-on: ubuntu-latest
     timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        workspace:
+          - frontend
+          - lti-dashboard
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
@@ -27,7 +33,7 @@ jobs:
       - run: pnpm install
       - name: Ember CLI Deploy
         timeout-minutes: 30
-        run: pnpm -r run --parallel deploy:production
+        run: pnpm --filter ${{matrix.workspace}} run deploy:production
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -13,6 +13,13 @@ jobs:
     name: Deploy
     runs-on: ubuntu-latest
     timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        workspace:
+          - frontend
+          - lti-course-manager
+          - lti-dashboard
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
@@ -25,7 +32,7 @@ jobs:
       - run: pnpm install
       - name: Ember CLI Deploy
         timeout-minutes: 30
-        run: pnpm -r run --parallel deploy:staging
+        run: pnpm --filter ${{matrix.workspace}} run deploy:staging
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/packages/lti-course-manager/config/deploy.js b/packages/lti-course-manager/config/deploy.js
@@ -31,6 +31,13 @@ module.exports = function (deployTarget) {
     ENV.s3.bucket = 'ilios-lti-course-manager-app-prod';
     ENV.cloudfront.distribution = 'E196RJPG6UDWJ1';
   }
+  if (deployTarget === 'development') {
+    ENV.build.environment = 'production';
+    ENV.pipeline.disabled = {
+      s3: true,
+      cloudfront: true,
+    };
+  }
 
   // Note: if you need to build some configuration asynchronously, you can return
   // a promise that resolves with the ENV object instead of returning the

diff --git a/packages/lti-course-manager/package.json b/packages/lti-course-manager/package.json
@@ -17,6 +17,7 @@
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "deploy:staging": "ember deploy staging --activate",
+    "deploy:test": "ember deploy development",
     "preinstall": "npx only-allow pnpm",
     "lint:deps": "ember dependency-lint"
   },

diff --git a/packages/lti-dashboard/config/deploy.js b/packages/lti-dashboard/config/deploy.js
@@ -30,6 +30,13 @@ module.exports = function (deployTarget) {
     ENV.s3.bucket = 'ilios-lti-app-production';
     ENV.cloudfront.distribution = 'E33FMSW7332DVL';
   }
+  if (deployTarget === 'development') {
+    ENV.build.environment = 'production';
+    ENV.pipeline.disabled = {
+      s3: true,
+      cloudfront: true,
+    };
+  }
 
   // Note: if you need to build some configuration asynchronously, you can return
   // a promise that resolves with the ENV object instead of returning the

diff --git a/packages/lti-dashboard/package.json b/packages/lti-dashboard/package.json
@@ -18,6 +18,7 @@
     "lint:js:fix": "eslint . --fix",
     "deploy:production": "ember deploy production --activate",
     "deploy:staging": "ember deploy staging --activate",
+    "deploy:test": "ember deploy development",
     "preinstall": "npx only-allow pnpm",
     "lint:deps": "ember dependency-lint"
   },
@@ -112,4 +113,4 @@
     ]
   },
   "private": true
-}
+}