Skip to content

Commit bbe4b3f

Browse files
committed
Merge remote-tracking branch 'origin/main' into LevelDbUrlHash
2 parents ea31746 + 5c42ab6 commit bbe4b3f

File tree

3 files changed

+34
-0
lines changed

3 files changed

+34
-0
lines changed

.github/workflows/android.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ jobs:
6262
git config --global credential.helper 'store --file /tmp/git-credentials'
6363
echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
6464
65+
- name: Enable Git Long-paths Support
66+
if: runner.os == 'Windows'
67+
run: git config --system core.longpaths true
68+
6569
- name: Check expanded matrix config
6670
if: github.event.inputs.expanded_matrix == '1'
6771
run: |

.github/workflows/desktop.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ jobs:
101101
git config --global credential.helper 'store --file /tmp/git-credentials'
102102
echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
103103
104+
- name: Enable Git Long-paths Support
105+
if: runner.os == 'Windows'
106+
run: git config --system core.longpaths true
107+
104108
- name: Setup Xcode version (macos)
105109
if: runner.os == 'macOS'
106110
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer

.github/workflows/integration_tests.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ jobs:
277277
run: |
278278
git config --global credential.helper 'store --file /tmp/git-credentials'
279279
echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
280+
- name: Enable Git Long-paths Support
281+
if: runner.os == 'Windows'
282+
run: git config --system core.longpaths true
280283
- name: Set env vars (Linux)
281284
if: startsWith(matrix.os, 'ubuntu')
282285
run: echo "VCPKG_TRIPLET=x64-linux" >> $GITHUB_ENV
@@ -471,6 +474,9 @@ jobs:
471474
run: |
472475
git config --global credential.helper 'store --file /tmp/git-credentials'
473476
echo 'https://${{ github.token }}@github.com' > /tmp/git-credentials
477+
- name: Enable Git Long-paths Support
478+
if: runner.os == 'Windows'
479+
run: git config --system core.longpaths true
474480
- name: Add msbuild to PATH (Windows)
475481
if: startsWith(matrix.os, 'windows')
476482
uses: microsoft/[email protected]
@@ -1140,11 +1146,21 @@ jobs:
11401146
uses: actions/setup-node@v2
11411147
with:
11421148
node-version: 14.x
1149+
- name: Setup java 17 for Firestore emulator
1150+
uses: actions/setup-java@v3
1151+
with:
1152+
distribution: 'temurin'
1153+
java-version: '17'
11431154
- name: Setup Firestore Emulator
11441155
if: steps.get-device-type.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
11451156
run: |
11461157
npm install -g firebase-tools
11471158
firebase emulators:start --only firestore --project demo-example &
1159+
- name: Setup java 8 for test_simulator.py
1160+
uses: actions/setup-java@v3
1161+
with:
1162+
distribution: 'temurin'
1163+
java-version: '8'
11481164
- name: Run Android integration tests on Emulator locally
11491165
timeout-minutes: 120
11501166
if: steps.get-device-type.outputs.device_type == 'virtual'
@@ -1245,6 +1261,11 @@ jobs:
12451261
uses: actions/setup-node@v2
12461262
with:
12471263
node-version: 14.x
1264+
- name: Setup java for Firestore emulator
1265+
uses: actions/setup-java@v3
1266+
with:
1267+
distribution: 'temurin'
1268+
java-version: '17'
12481269
- name: Setup Firestore Emulator
12491270
if: steps.get-device-type.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
12501271
run: |
@@ -1344,6 +1365,11 @@ jobs:
13441365
timeout_minutes: 1
13451366
max_attempts: 3
13461367
command: pip install -r scripts/gha/requirements.txt
1368+
- name: Setup java for Firestore emulator
1369+
uses: actions/setup-java@v3
1370+
with:
1371+
distribution: 'temurin'
1372+
java-version: '17'
13471373
- name: Setup Firestore Emulator
13481374
if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
13491375
run: |

0 commit comments

Comments
 (0)