Skip to content

Commit 48c7dcd

Browse files
Merge main into release
2 parents ca4a66c + 180b1ad commit 48c7dcd

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.github/workflows/e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
pushd functions
6969
npm install
7070
popd
71-
npx firebase-tools@13.0.2 deploy --only functions:callTest --project jscore-sandbox-141b5 --token $FIREBASE_CLI_TOKEN
71+
npx firebase-tools@14.24.2 deploy --only functions:callTest --project jscore-sandbox-141b5 --token $FIREBASE_CLI_TOKEN
7272
working-directory: ./config
7373
env:
7474
FIREBASE_CLI_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}

config/firebase.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"indexes": "firestore.indexes.json"
88
},
99
"functions": {
10-
"runtime": "nodejs18"
10+
"runtime": "nodejs20"
1111
}
1212
}

config/functions/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
const assert = require('assert');
1919
const cors = require('cors')({ origin: true });
20-
const functions = require('firebase-functions');
20+
const functions = require('firebase-functions/v1');
2121

2222
/*
2323
* These backend test helpers are copied from the iOS and Android SDKs, but are

config/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dependencies": {
55
"cors": "2.8.5",
66
"firebase-admin": "11.11.1",
7-
"firebase-functions": "3.24.1"
7+
"firebase-functions": "^7.0.0"
88
},
99
"private": true,
1010
"engines": {

scripts/ci-test/deploy-if-needed.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ interface DeployOptions {
3030
token: string;
3131
cwd: string;
3232
only?: string;
33+
force: boolean;
3334
}
3435

3536
/**
@@ -67,7 +68,8 @@ async function deployIfNeeded() {
6768
const deployOptions: DeployOptions = {
6869
project: config.projectId,
6970
token,
70-
cwd: resolve(root, 'config')
71+
cwd: resolve(root, 'config'),
72+
force: true
7173
};
7274
if (flags.length === 0) {
7375
console.log(

0 commit comments

Comments
 (0)