diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index f9ac06ab9c0..89ea939dce2 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -68,7 +68,7 @@ jobs: pushd functions npm install popd - npx firebase-tools@13.0.2 deploy --only functions:callTest --project jscore-sandbox-141b5 --token $FIREBASE_CLI_TOKEN + npx firebase-tools@14.24.2 deploy --only functions:callTest --project jscore-sandbox-141b5 --token $FIREBASE_CLI_TOKEN working-directory: ./config env: FIREBASE_CLI_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }} diff --git a/config/firebase.json b/config/firebase.json index ccf3b6fe785..9b1cdcd2e8d 100644 --- a/config/firebase.json +++ b/config/firebase.json @@ -7,6 +7,6 @@ "indexes": "firestore.indexes.json" }, "functions": { - "runtime": "nodejs18" + "runtime": "nodejs20" } } diff --git a/config/functions/index.js b/config/functions/index.js index d4cd08998ff..d992251caf7 100644 --- a/config/functions/index.js +++ b/config/functions/index.js @@ -17,7 +17,7 @@ const assert = require('assert'); const cors = require('cors')({ origin: true }); -const functions = require('firebase-functions'); +const functions = require('firebase-functions/v1'); /* * These backend test helpers are copied from the iOS and Android SDKs, but are diff --git a/config/functions/package.json b/config/functions/package.json index 4b823c3de04..01e469968bd 100644 --- a/config/functions/package.json +++ b/config/functions/package.json @@ -4,7 +4,7 @@ "dependencies": { "cors": "2.8.5", "firebase-admin": "11.11.1", - "firebase-functions": "3.24.1" + "firebase-functions": "^7.0.0" }, "private": true, "engines": { diff --git a/scripts/ci-test/deploy-if-needed.ts b/scripts/ci-test/deploy-if-needed.ts index 854d0ca3b0c..ce4e8a4f7d7 100644 --- a/scripts/ci-test/deploy-if-needed.ts +++ b/scripts/ci-test/deploy-if-needed.ts @@ -30,6 +30,7 @@ interface DeployOptions { token: string; cwd: string; only?: string; + force: boolean; } /** @@ -67,7 +68,8 @@ async function deployIfNeeded() { const deployOptions: DeployOptions = { project: config.projectId, token, - cwd: resolve(root, 'config') + cwd: resolve(root, 'config'), + force: true }; if (flags.length === 0) { console.log(