@@ -253,20 +253,20 @@ jobs:
253
253
with :
254
254
ref : ${{needs.prepare_matrix.outputs.github_ref}}
255
255
submodules : true
256
- - name : Set env vars (ubuntu )
256
+ - name : Set env vars (Linux )
257
257
if : startsWith(matrix.os, 'ubuntu')
258
258
run : echo "VCPKG_TRIPLET=x64-linux" >> $GITHUB_ENV
259
- - name : Set env vars (macos )
259
+ - name : Set env vars (macOS )
260
260
if : startsWith(matrix.os, 'macos')
261
261
run : echo "VCPKG_TRIPLET=x64-osx" >> $GITHUB_ENV
262
- - name : Set env vars (windows )
262
+ - name : Set env vars (Windows )
263
263
shell : bash
264
264
if : startsWith(matrix.os, 'windows')
265
265
run : echo "VCPKG_TRIPLET=x64-windows-static" >> $GITHUB_ENV
266
- - name : Set env vars(all)
266
+ - name : Set env vars (all)
267
267
shell : bash
268
268
run : echo "VCPKG_RESPONSE_FILE=external/vcpkg_${{ env.VCPKG_TRIPLET }}_response_file.txt" >> $GITHUB_ENV
269
- - name : Add msbuild to PATH (windows )
269
+ - name : Add msbuild to PATH (Windows )
270
270
if : startsWith(matrix.os, 'windows')
271
271
272
272
- name : Cache vcpkg C++ dependencies
@@ -293,12 +293,12 @@ jobs:
293
293
run : |
294
294
pip install -r scripts/gha/requirements.txt
295
295
python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}"
296
- - name : Install OpenSSL (windows )
296
+ - name : Install OpenSSL (Windows )
297
297
if : matrix.ssl_variant == 'openssl' &&
298
298
startsWith(matrix.os, 'windows')
299
299
run : |
300
300
choco install openssl -r
301
- - name : Install OpenSSL (MacOS )
301
+ - name : Install OpenSSL (macOS )
302
302
if : matrix.ssl_variant == 'openssl' &&
303
303
startsWith(matrix.os, 'macos')
304
304
run : |
@@ -341,7 +341,7 @@ jobs:
341
341
--artifact_name "desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}" \
342
342
--noadd_timestamp \
343
343
--short_output_paths \
344
- ${additional_flags[*]}
344
+ ${additional_flags[*]}
345
345
- name : Upload Desktop integration tests artifact
346
346
347
347
if : ${{ !cancelled() }}
@@ -356,6 +356,39 @@ jobs:
356
356
name : log-artifact
357
357
path : build-results-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}*
358
358
retention-days : ${{ env.artifactRetentionDays }}
359
+ - name : Cleanup Local Copies of Uploaded Artifacts
360
+ shell : bash
361
+ run : |
362
+ rm -rf testapps-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}
363
+ - name : Configure GCS Upload Directory (Linux, macOS)
364
+ if : (startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')) && !cancelled()
365
+ shell : bash
366
+ run : echo "GCS_UPLOAD_DIR=${{ github.workspace }}" >> $GITHUB_ENV
367
+ - name : Configure GCS Upload Directory (Windows)
368
+ # For Windows move the uploads to C: to create enough space for the
369
+ # Cloud SDK installation on D:.
370
+ if : startsWith(matrix.os, 'windows') && !cancelled()
371
+ shell : bash
372
+ run : echo "GCS_UPLOAD_DIR=/c/fpl-upload" >> $GITHUB_ENV
373
+ - name : Move GCS Artifacts to GCS Upload Dir
374
+ # Copy the artifacts and also the upload scripts since python's relpath
375
+ # produces errors when called across two different drives. Use tar to
376
+ # move the files as it neatly deepcopies firestore's symlinks.
377
+ if : ${{ (env.GCS_UPLOAD_DIR != github.workspace) && !cancelled() }}
378
+ shell : bash
379
+ run : |
380
+ set -x
381
+ mkdir -p ${{env.GCS_UPLOAD_DIR}}/scripts/gha/integration_testing
382
+ mkdir -p ${{env.GCS_UPLOAD_DIR}}/scripts/gha-encrypted
383
+ # The ta directory contains the integration testapps to archive.
384
+ tar -chf ${{env.GCS_UPLOAD_DIR}}/ta.tar ta
385
+ rm -rf ta
386
+ tar xf ${{env.GCS_UPLOAD_DIR}}/ta.tar -C ${{env.GCS_UPLOAD_DIR}}
387
+ rm ${{env.GCS_UPLOAD_DIR}}/ta.tar
388
+ cp scripts/gha/gcs_uploader.py ${{env.GCS_UPLOAD_DIR}}/scripts/gha-encrypted/
389
+ cp scripts/gha/integration_testing/gcs.py ${{env.GCS_UPLOAD_DIR}}/scripts/gha/integration_testing/
390
+ cp scripts/gha/gcs_uploader.py ${{env.GCS_UPLOAD_DIR}}/scripts/gha/
391
+ cp scripts/gha-encrypted/gcs_key_file.json ${{env.GCS_UPLOAD_DIR}}//scripts/gha-encrypted/
359
392
- name : Set CLOUDSDK_PYTHON (Windows)
360
393
shell : bash
361
394
if : startsWith(matrix.os, 'windows') && !cancelled()
@@ -364,8 +397,12 @@ jobs:
364
397
if : ${{ !cancelled() }}
365
398
uses : google-github-actions/setup-gcloud@master
366
399
- name : Upload Desktop Artifacts to GCS
400
+ shell : bash
367
401
if : ${{ !cancelled() }}
368
- run : python scripts/gha/gcs_uploader.py --testapp_dir ta --key_file scripts/gha-encrypted/gcs_key_file.json
402
+ run : |
403
+ pushd ${{env.GCS_UPLOAD_DIR}}
404
+ python scripts/gha/gcs_uploader.py --testapp_dir ta --key_file scripts/gha-encrypted/gcs_key_file.json
405
+ popd
369
406
- name : Add failure label
370
407
# We can mark a failure as soon as any one test fails.
371
408
if : ${{ needs.check_trigger.outputs.should_update_labels && failure() && !cancelled() }}
@@ -431,20 +468,20 @@ jobs:
431
468
with :
432
469
ref : ${{needs.prepare_matrix.outputs.github_ref}}
433
470
submodules : true
434
- - name : Set env vars (ubuntu )
471
+ - name : Set env vars (Linux )
435
472
if : startsWith(matrix.os, 'ubuntu')
436
473
run : echo "VCPKG_TRIPLET=x64-linux" >> $GITHUB_ENV
437
- - name : Set env vars (macos )
474
+ - name : Set env vars (macOS )
438
475
if : startsWith(matrix.os, 'macos')
439
476
run : echo "VCPKG_TRIPLET=x64-osx" >> $GITHUB_ENV
440
- - name : Set env vars (windows )
477
+ - name : Set env vars (Windows )
441
478
shell : bash
442
- if : startsWith(matrix.os, 'windows ')
479
+ if : startsWith(matrix.os, 'Windows ')
443
480
run : echo "VCPKG_TRIPLET=x64-windows-static" >> $GITHUB_ENV
444
- - name : Set env vars(all)
481
+ - name : Set env vars (all)
445
482
shell : bash
446
483
run : echo "VCPKG_RESPONSE_FILE=external/vcpkg_${{ env.VCPKG_TRIPLET }}_response_file.txt" >> $GITHUB_ENV
447
- - name : Add msbuild to PATH (windows )
484
+ - name : Add msbuild to PATH (Windows )
448
485
if : startsWith(matrix.os, 'windows')
449
486
450
487
- name : Cache NDK
@@ -575,9 +612,9 @@ jobs:
575
612
with :
576
613
ref : ${{needs.prepare_matrix.outputs.github_ref}}
577
614
submodules : true
578
- - name : Set env vars (macos )
615
+ - name : Set env vars (macOS )
579
616
run : echo "VCPKG_TRIPLET=x64-osx" >> $GITHUB_ENV
580
- - name : Set env vars(all)
617
+ - name : Set env vars (all)
581
618
shell : bash
582
619
run : echo "VCPKG_RESPONSE_FILE=external/vcpkg_${{ env.VCPKG_TRIPLET }}_response_file.txt" >> $GITHUB_ENV
583
620
- name : Setup python
0 commit comments