feat: bump toolset and unity-changeset (#67)

webbertakken · web-flow · commit 0b3d7c88df52 · 2025-10-08T23:24:08.000+02:00
* feat: bump toolset and unity-changeset

* chore: fix workflows for latest yarn

* chore: downgrade to node functions lts

* chore: workspaces

* chore: bump w9jds/firebase-action

* chore: bump predeploy

* chore: sending good vibes

* chore: fix node version

* chore: no force was used to add this word
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,64 +9,90 @@ jobs:
     name: 🧪 Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install package manager (from package.json)
+        run: |
+          corepack enable
+          corepack install
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: package.json
           cache: 'yarn'
-      - name: install dependencies
-        run: yarn && yarn --cwd ./functions
+
+      - name: Install deps
+        run: yarn install --immutable
+
       - name: run linter
-        run: yarn lint && yarn --cwd ./functions lint
+        run: yarn lint && yarn workspace functions lint
+
       - name: run tests
-        run: yarn test && yarn --cwd ./functions test
-  #      - name: Upload test results
-  #        uses: actions/upload-artifact@v1
-  #        with:
-  #          name: Test results
-  #          path: "**/artifacs"
+        run: yarn test && yarn workspace functions test
 
   build:
     name: 🛠 Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install package manager (from package.json)
+        run: |
+          corepack enable
+          corepack install
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: package.json
           cache: 'yarn'
-      - name: install dependencies
-        run: yarn && yarn --cwd ./functions
+
+      - name: Install deps
+        run: yarn install --immutable
+
       - name: build
-        run: yarn --cwd ./functions build
+        run: yarn workspace functions build
 
   testDeploy:
     name: Test Deploy
     needs: [test, build]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install package manager (from package.json)
+        run: |
+          corepack enable
+          corepack install
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: package.json
           cache: 'yarn'
-      - name: install dependencies
-        run: yarn && yarn --cwd ./functions
+
+      - name: Install deps
+        run: yarn install
+
       - name: Deploy test to Firebase
-        uses: w9jds/firebase-action@v13.25.0
+        uses: w9jds/firebase-action@v14.19.0
         with:
-          args: deploy --only functions:testFunction
+          args: help ; corepack enable ; corepack install ; firebase deploy --only functions:testFunction --force
         env:
           GCP_SA_KEY: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_UNITY_CI_VERSIONS }}'
 
       - name: Call Test Function
         run: curl -f -s -S -X POST https://testfunction-wbe4ukn6tq-ey.a.run.app
 
       - name: Cleanup Firebase Test
-        uses: w9jds/firebase-action@v13.25.0
+        uses: w9jds/firebase-action@v14.19.0
         if: always()
         with:
-          args: functions:delete testFunction --force
+          args: help ; corepack enable ; corepack install ; firebase functions:delete testFunction --force
         env:
           GCP_SA_KEY: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_UNITY_CI_VERSIONS }}'
 
@@ -76,23 +102,34 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install package manager (from package.json)
+        run: |
+          corepack enable
+          corepack install
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: package.json
           cache: 'yarn'
-      - name: install dependencies
-        run: yarn && yarn --cwd ./functions
+
+      - name: Install deps
+        run: yarn install --immutable
+
       - name: Deploy to Firebase
-        uses: w9jds/firebase-action@v13.25.0
+        uses: w9jds/firebase-action@v14.19.0
         with:
-          args: deploy
+          args: help ; corepack enable ; corepack install ; firebase deploy
         env:
           GCP_SA_KEY: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_UNITY_CI_VERSIONS }}'
+
       - name: Cleanup Firebase Test
-        uses: w9jds/firebase-action@v13.25.0
+        uses: w9jds/firebase-action@v14.19.0
         if: always()
         with:
-          args: functions:delete testFunction --force
+          args: help ; corepack enable ; corepack install ; firebase functions:delete testFunction --force
         env:
           GCP_SA_KEY: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_UNITY_CI_VERSIONS }}'
diff --git a/.gitignore b/.gitignore
@@ -69,4 +69,7 @@ node_modules/
 .idea
 .vs
 .vscode
+
+# Yarn
 functions/.yarn/
+.yarn/
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/README.md b/README.md
@@ -60,12 +60,14 @@ The Ingeminator ("repeater") handles the reliability of the build system:
 ## Database Backup
 
 Back up the Firestore database:
+
 ```bash
 export GOOGLE_APPLICATION_CREDENTIALS="/path/to/serviceAccountKey.json"
 yarn run backfire export ./export/versioningBackendBackup --project unity-ci-versions --keyFile $GOOGLE_APPLICATION_CREDENTIALS
 ```
 
 Restore a backup:
+
 ```bash
 yarn run backfire import ./export/versioningBackendBackup --project unity-ci-versions --keyFile $GOOGLE_APPLICATION_CREDENTIALS
 ```
diff --git a/firebase.json b/firebase.json
@@ -4,19 +4,16 @@
     "indexes": "firestore.indexes.json"
   },
   "functions": {
+    "runtime": "nodejs22",
     "predeploy": [
-      "yarn --cwd \"$RESOURCE_DIR\" lint",
-      "yarn --cwd \"$RESOURCE_DIR\" test",
-      "yarn --cwd \"$RESOURCE_DIR\" build"
+      "yarn workspace functions lint",
+      "yarn workspace functions test",
+      "yarn workspace functions build"
     ]
   },
   "hosting": {
     "public": "public",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ]
+    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
   },
   "storage": {
     "rules": "storage.rules"
diff --git a/functions/package.json b/functions/package.json
@@ -12,7 +12,7 @@
     "test": "echo \"No tests yet, feel free to add\" && exit 0"
   },
   "engines": {
-    "node": "20"
+    "node": "22"
   },
   "main": "lib/index.js",
   "dependencies": {
@@ -21,11 +21,10 @@
     "eris": "^0.17.2",
     "firebase-admin": "^12.7.0",
     "firebase-functions": "^6.1.0",
-    "graphql": "^16.9.0",
     "lodash": "^4.17.21",
     "node-fetch": "^2.7.0",
     "semver": "^7.6.3",
-    "unity-changeset": "^2.5.0"
+    "unity-changeset": "^3.0.1"
   },
   "devDependencies": {
     "@octokit/types": "^13.5.0",
@@ -44,7 +43,8 @@
   },
   "private": true,
   "volta": {
-    "node": "20.14.0",
-    "yarn": "1.22.22"
-  }
+    "node": "22.20.0",
+    "yarn": "4.10.3"
+  },
+  "packageManager": "yarn@4.10.3"
 }
diff --git a/functions/yarn.lock b/functions/yarn.lock
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
 .idea
 .vs
 .vscode
++
 +# Yarn
 functions/.yarn/
 +.yarn/