Fix merge conflicts with main

nwplus · Dec 13, 2023 · b15b6ed · b15b6ed
2 parents 9190aa6 + 9fcf52d
commit b15b6ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -34,3 +34,4 @@ jobs:
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_NWPLUS_UBC }}'
           channelId: live
           projectId: nwplus-ubc
+          firebaseToolsVersion: 12.9.1
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18.x'
+          node-version: '16.x'
       - name: Install and Build
         run: yarn install --frozen-lockfile && yarn build
         env:
@@ -32,3 +32,4 @@ jobs:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_NWPLUS_UBC }}'
           projectId: nwplus-ubc
+          firebaseToolsVersion: 12.9.1