Skip to content

Commit 9fc20d6

Browse files
committed
Merge branch 'master' into email-enum-docs2
2 parents 9291d5c + bebecda commit 9fc20d6

File tree

100 files changed

+149251
-614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+149251
-614
lines changed

.changeset/lucky-dragons-juggle.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/real-dolls-type.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
'@firebase/auth-compat': minor
3+
'@firebase/firestore': minor
4+
'@firebase/functions': minor
5+
'@firebase/storage': minor
6+
'@firebase/auth': minor
7+
'firebase': minor
8+
---
9+
10+
Replaced node-fetch v2.6.7 dependency with the latest version of undici (v5.26.5) in Node.js SDK
11+
builds for auth, firestore, functions and storage.

.github/workflows/test-changed-firestore-integration.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- uses: 'google-github-actions/auth@v0'
1717
with:
1818
credentials_json: '${{ secrets.JSSDK_ACTIONS_SA_KEY }}'
19+
1920
# create composite indexes with Terraform
2021
- name: Setup Terraform
2122
uses: hashicorp/setup-terraform@v2
@@ -29,8 +30,21 @@ jobs:
2930
if: github.event_name == 'pull_request'
3031
run: |
3132
cd packages/firestore
32-
terraform apply -var-file=../../config/project.json -auto-approve &> /dev/null
33+
34+
# Define a temporary file, redirect both stdout and stderr to it
35+
output_file=$(mktemp)
36+
if ! terraform apply -var-file=../../config/project.json -auto-approve > "$output_file" 2>&1 ; then
37+
cat "$output_file"
38+
if cat "$output_file" | grep -q "index already exists"; then
39+
echo "==================================================================================="
40+
echo -e "\e[93m\e[1mTerraform apply failed due to index already exists; We can safely ignore this error.\e[0m"
41+
echo "==================================================================================="
42+
fi
43+
exit 1
44+
fi
45+
rm -f "$output_file"
3346
continue-on-error: true
47+
3448
- name: Set up Node (16)
3549
uses: actions/setup-node@v3
3650
with:

0 commit comments

Comments
 (0)