Use yarn

m-lab · Jan 24, 2024 · fc6ad12 · fc6ad12
1 parent 3a19549
commit fc6ad12
Show file tree

Hide file tree

Showing 4 changed files with 2,222 additions and 941 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm run build
+      - run: npm install -g yarn && yarn install --frozen-lockfile && yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm run build
+      - run: npm install -g yarn && yarn install --frozen-lockfile && yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_MLAB_OTI }}'
-          projectId: mlab-sandbox
+          projectId: mlab-oti
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "shelljs": "^0.6.0"
   },
   "scripts": {
-    "build": "npm install -g firebase-tools gulp && gulp copy_libs",
+    "build": "npm install -g firebase-tools gulp && yarn install && yarn && gulp copy_libs",
     "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'app/libraries', 'junction') } catch (e) { }\"",
     "pretest": "npm install"
   },