Skip to content

Commit f350d0e

Browse files
jonsimantovjonsimantov
authored
Change all ubuntu-20 runners to ubuntu-22 (#1693)
* Change all ubuntu-20 runners to ubuntu-22. Let's see what happens. * Also update the generated matrix. * Don't remove PCRE packages * Attempt to remove libpcre3. * Add missing libpcre2. * Use updated posix library. * Update PCRE package list. * Add missing libgcc package. * Add another package. * Try the cross compilation package. * Print out all the installed libraries for diagnosis. * Remove tabs. * Add another diagnostic command. * Force GCC 10 multilib. * Remove x86 Linux support. * Remove debug output. * Revert "Remove x86 Linux support." This reverts commit 9ede958. * Update permissions.
1 parent 3116ed0 commit f350d0e

14 files changed

+73
-71
lines changed

‎.github/workflows/android.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concurrency:
2121

2222
jobs:
2323
prepare_matrix:
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525
outputs:
2626
matrix_os: ${{ steps.export-result.outputs.matrix_os }}
2727
matrix_architecture: ${{ steps.export-result.outputs.matrix_architecture }}

‎.github/workflows/build-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
test_set: [ general, firestore ]
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121
name: generate-report-${{ matrix.test_set }}
2222
steps:
2323
- name: Pause 5 minutes to offset Firestore fetches.

‎.github/workflows/checks.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717

1818
jobs:
1919
file_format_check:
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121
steps:
2222
- uses: actions/checkout@v3
2323
with:
@@ -40,7 +40,7 @@ jobs:
4040

4141
check_integration_test_labels:
4242
# This check fails if integration tests are queued, in progress, or failed.
43-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4444
steps:
4545
- uses: docker://agilepathway/pull-request-label-checker:latest
4646
with:
@@ -49,7 +49,7 @@ jobs:
4949

5050
generated_docs_check:
5151
# This check succeeds if Doxygen documentation generates without errors.
52-
runs-on: ubuntu-20.04
52+
runs-on: ubuntu-22.04
5353
steps:
5454
- uses: actions/checkout@v3
5555
with:
@@ -88,7 +88,7 @@ jobs:
8888
8989
copyright_check:
9090
# Check for Google copyright in each file.
91-
runs-on: ubuntu-20.04
91+
runs-on: ubuntu-22.04
9292
steps:
9393
- uses: actions/checkout@v3
9494
with:
@@ -100,7 +100,7 @@ jobs:
100100
101101
release_notes_check:
102102
# Check that the readme was updated, unless the PR has a specific label set (env.skipReleaseNotesLabel).
103-
runs-on: ubuntu-20.04
103+
runs-on: ubuntu-22.04
104104
steps:
105105
- uses: actions/checkout@v3
106106
# Skip this if the PR has the skipReleaseNotes label or if it's a merge to other than main.

‎.github/workflows/checks_secure.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
jobs:
1313
dismiss_stale_approvals:
1414
# Dismiss stale approvals for users without write access, or if this PR comes from a fork.
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616
# Only if another commit was added to the PR.
1717
steps:
1818
- name: Check user permission

‎.github/workflows/cpp-packaging.yml‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ env:
4242
jobs:
4343
log_inputs:
4444
name: log-inputs
45-
runs-on: ubuntu-20.04
45+
runs-on: ubuntu-22.04
4646
steps:
4747
- name: log run inputs
4848
run: |
@@ -79,9 +79,9 @@ jobs:
7979
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
8080
strategy:
8181
matrix:
82-
os: [ubuntu-20.04, macos-13]
82+
os: [ubuntu-22.04, macos-13]
8383
include:
84-
- os: ubuntu-20.04
84+
- os: ubuntu-22.04
8585
tools_platform: linux
8686
# Binutils 2.35.1 released Sep 19, 2020
8787
binutils_version: "2.35.1"
@@ -243,7 +243,7 @@ jobs:
243243

244244
build_and_package_android:
245245
name: build-and-package-android
246-
runs-on: ubuntu-20.04
246+
runs-on: ubuntu-22.04
247247
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
248248
strategy:
249249
fail-fast: false
@@ -308,7 +308,7 @@ jobs:
308308
strategy:
309309
fail-fast: false
310310
matrix:
311-
os: [windows-latest, ubuntu-20.04, macos-13]
311+
os: [windows-latest, ubuntu-22.04, macos-13]
312312
build_type: ["Release", "Debug"]
313313
architecture: ["x64", "x86", "arm64"]
314314
msvc_runtime: ["static", "dynamic"]
@@ -322,7 +322,7 @@ jobs:
322322
msvc_runtime: "dynamic"
323323
vcpkg_triplet_suffix: "windows-static-md"
324324
sdk_platform: "windows"
325-
- os: ubuntu-20.04
325+
- os: ubuntu-22.04
326326
vcpkg_triplet_suffix: "linux"
327327
additional_build_flags: ""
328328
sdk_platform: "linux"
@@ -342,11 +342,11 @@ jobs:
342342
linux_abi: "c++11"
343343
- os: macos-13
344344
build_type: "Debug"
345-
- os: ubuntu-20.04
345+
- os: ubuntu-22.04
346346
msvc_runtime: "dynamic"
347-
- os: ubuntu-20.04
347+
- os: ubuntu-22.04
348348
build_type: "Debug"
349-
- os: ubuntu-20.04
349+
- os: ubuntu-22.04
350350
architecture: "arm64"
351351
- os: windows-latest
352352
architecture: "arm64"
@@ -409,7 +409,6 @@ jobs:
409409
max_attempts: 3
410410
command: |
411411
python scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.architecture }}' --ssl boringssl
412-
413412
- name: Export verbose flag
414413
shell: bash
415414
run: |
@@ -465,40 +464,40 @@ jobs:
465464
matrix:
466465
sdk_platform: [linux, darwin, windows]
467466
suffix: ['']
468-
runs_on_platform: [ubuntu-20.04]
467+
runs_on_platform: [ubuntu-22.04]
469468
include:
470469
# Split windows packaging into multiple runners.
471470
- sdk_platform: windows
472471
suffix: '-x86-Release-static'
473-
runs_on_platform: ubuntu-20.04
472+
runs_on_platform: ubuntu-22.04
474473
- sdk_platform: windows
475474
suffix: '-x86-Release-dynamic'
476-
runs_on_platform: ubuntu-20.04
475+
runs_on_platform: ubuntu-22.04
477476
- sdk_platform: windows
478477
suffix: '-x64-Release-static'
479-
runs_on_platform: ubuntu-20.04
478+
runs_on_platform: ubuntu-22.04
480479
- sdk_platform: windows
481480
suffix: '-x64-Release-dynamic'
482-
runs_on_platform: ubuntu-20.04
481+
runs_on_platform: ubuntu-22.04
483482
- sdk_platform: windows
484483
suffix: '-x86-Debug-static'
485-
runs_on_platform: ubuntu-20.04
484+
runs_on_platform: ubuntu-22.04
486485
- sdk_platform: windows
487486
suffix: '-x86-Debug-dynamic'
488-
runs_on_platform: ubuntu-20.04
487+
runs_on_platform: ubuntu-22.04
489488
- sdk_platform: windows
490489
suffix: '-x64-Debug-static'
491-
runs_on_platform: ubuntu-20.04
490+
runs_on_platform: ubuntu-22.04
492491
- sdk_platform: windows
493492
suffix: '-x64-Debug-dynamic'
494-
runs_on_platform: ubuntu-20.04
493+
runs_on_platform: ubuntu-22.04
495494
- sdk_platform: darwin
496495
runs_on_platform: macos-13
497496
exclude:
498497
- sdk_platform: windows
499498
suffix: ''
500499
- sdk_platform: darwin
501-
runs_on_platform: ubuntu-20.04
500+
runs_on_platform: ubuntu-22.04
502501
steps:
503502
- name: setup Xcode version (macos)
504503
if: runner.os == 'macOS'
@@ -656,7 +655,7 @@ jobs:
656655

657656
download_sdk_package:
658657
name: download-sdk-package
659-
runs-on: ubuntu-20.04
658+
runs-on: ubuntu-22.04
660659
needs: [log_inputs]
661660
if: ${{ github.event.inputs.downloadPublicVersion != '' || github.event.inputs.downloadPreviousRun != '' }}
662661
steps:
@@ -706,7 +705,7 @@ jobs:
706705

707706
merge_packages:
708707
name: final-merge-packages
709-
runs-on: ubuntu-20.04
708+
runs-on: ubuntu-22.04
710709
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
711710
needs: [build_and_package_ios_tvos, build_and_package_android, package_desktop, log_inputs]
712711
steps:
@@ -767,7 +766,7 @@ jobs:
767766

768767
create_windows_only_package:
769768
name: create-windows-only-package
770-
runs-on: ubuntu-20.04
769+
runs-on: ubuntu-22.04
771770
needs: [merge_packages]
772771
steps:
773772
- name: download SDK zip
@@ -814,7 +813,7 @@ jobs:
814813
# Clean up intermediate artifacts from packaging step.
815814
# This can happen after the final package merge is finished.
816815
name: cleanup-packaging-artifacts
817-
runs-on: ubuntu-20.04
816+
runs-on: ubuntu-22.04
818817
needs: [merge_packages]
819818
if: |
820819
(
@@ -835,7 +834,7 @@ jobs:
835834
# Trigger the integration_tests workflow.
836835
needs: [merge_packages, download_sdk_package, create_windows_only_package, cleanup_packaging_artifacts]
837836
if: (github.event.inputs.skipIntegrationTests == 0 || github.event.inputs.skipIntegrationTests == '') && !cancelled() && !failure()
838-
runs-on: ubuntu-20.04
837+
runs-on: ubuntu-22.04
839838
steps:
840839
- name: Checkout repo
841840
uses: actions/checkout@v3
@@ -904,7 +903,7 @@ jobs:
904903
attempt_retry:
905904
name: "attempt-retry"
906905
needs: [trigger_integration_tests]
907-
runs-on: ubuntu-20.04
906+
runs-on: ubuntu-22.04
908907
if: ${{ failure() && !cancelled() && github.event_name == 'schedule' }}
909908
steps:
910909
- name: Checkout repo

‎.github/workflows/desktop.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ concurrency:
2020

2121
jobs:
2222
prepare_matrix:
23-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-22.04
2424
outputs:
2525
matrix_os: ${{ steps.export-result.outputs.matrix_os }}
2626
matrix_build_type: ${{ steps.export-result.outputs.matrix_build_type }}
@@ -70,24 +70,24 @@ jobs:
7070
msvc_runtime: "dynamic"
7171
exclude:
7272
# msvc_runtime excludes
73-
- os: ubuntu-20.04
73+
- os: ubuntu-22.04
7474
msvc_runtime: "dynamic"
7575
- os: macos-13
7676
msvc_runtime: "dynamic"
7777
# architecture excluees
7878
- os: macos-13
7979
architecture: "x86"
8080
# Xcode excludes -- allow only one on osx and linux
81-
- os: ubuntu-20.04
81+
- os: ubuntu-22.04
8282
xcode_version: "11.7"
8383
- os: windows-latest
8484
xcode_version: "11.7"
85-
- os: ubuntu-20.04
85+
- os: ubuntu-22.04
8686
xcode_version: "12.5.1"
8787
- os: windows-latest
8888
xcode_version: "12.5.1"
8989
# arm64 is only for macos
90-
- os: ubuntu-20.04
90+
- os: ubuntu-22.04
9191
architecture: "arm64"
9292
- os: windows-latest
9393
architecture: "arm64"
@@ -292,7 +292,7 @@ jobs:
292292
### It's possible to add more apps here once integration tests are less flaky.
293293
name: local-integration-tests-linux-openssl
294294
needs: prepare_matrix
295-
runs-on: ubuntu-20.04
295+
runs-on: ubuntu-22.04
296296
strategy:
297297
fail-fast: false
298298
steps:
@@ -331,15 +331,15 @@ jobs:
331331
python scripts/gha/build_testapps.py --p Desktop \
332332
--t ${apis} \
333333
--output_directory "${{ github.workspace }}" \
334-
--artifact_name "desktop-ubuntu-20.04-openssl" \
334+
--artifact_name "desktop-ubuntu-22.04-openssl" \
335335
--noadd_timestamp \
336336
--short_output_paths \
337337
--cmake_flag=-DFIREBASE_QUICK_TEST=ON
338338
- name: Summarize build results
339339
if: ${{ !cancelled() }}
340340
shell: bash
341341
run: |
342-
cat build-results-desktop-ubuntu-20.04-openssl.log
342+
cat build-results-desktop-ubuntu-22.04-openssl.log
343343
if [[ "${{ job.status }}" != "success" ]]; then
344344
exit 1
345345
fi
@@ -361,15 +361,15 @@ jobs:
361361
java-version: '17'
362362
- name: Run Desktop integration tests
363363
run: |
364-
cp scripts/gha/integration_testing/google-services.json testapps-desktop-ubuntu-20.04-openssl/firestore/google-services.json
365-
firebase emulators:exec --only firestore --project demo-example 'python scripts/gha/desktop_tester.py --testapp_dir testapps-desktop-ubuntu-20.04-openssl --logfile_name "desktop-ubuntu-20.04-openssl"'
364+
cp scripts/gha/integration_testing/google-services.json testapps-desktop-ubuntu-22.04-openssl/firestore/google-services.json
365+
firebase emulators:exec --only firestore --project demo-example 'python scripts/gha/desktop_tester.py --testapp_dir testapps-desktop-ubuntu-22.04-openssl --logfile_name "desktop-ubuntu-22.04-openssl"'
366366
env:
367367
USE_FIRESTORE_EMULATOR: true
368368
- name: Summarize test results
369369
if: ${{ !cancelled() }}
370370
shell: bash
371371
run: |
372-
cat testapps-desktop-ubuntu-20.04-openssl/test-results-desktop-ubuntu-20.04-openssl.log
372+
cat testapps-desktop-ubuntu-22.04-openssl/test-results-desktop-ubuntu-22.04-openssl.log
373373
if [[ "${{ job.status }}" != "success" ]]; then
374374
exit 1
375375
fi

0 commit comments

Comments
 (0)