From 020c1dbb186cdad8c9aa1640b5ce1c52952364c9 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 14 Feb 2025 11:23:42 -0800 Subject: [PATCH 01/18] Change all ubuntu-20 runners to ubuntu-22. Let's see what happens. --- .github/workflows/android.yml | 2 +- .github/workflows/build-report.yml | 2 +- .github/workflows/checks.yml | 10 ++-- .github/workflows/checks_secure.yml | 2 +- .github/workflows/cpp-packaging.yml | 50 +++++++++---------- .github/workflows/desktop.yml | 22 ++++---- .github/workflows/integration_tests.yml | 16 +++--- .github/workflows/ios.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/retry-test-failures.yml | 2 +- .github/workflows/reviewer-roulette.yml | 2 +- .github/workflows/update-feature-branches.yml | 4 +- 12 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f540ce20ab..f1834b3d1c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -21,7 +21,7 @@ concurrency: jobs: prepare_matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: matrix_os: ${{ steps.export-result.outputs.matrix_os }} matrix_architecture: ${{ steps.export-result.outputs.matrix_architecture }} diff --git a/.github/workflows/build-report.yml b/.github/workflows/build-report.yml index 1c8db7c800..9af62a6bf8 100644 --- a/.github/workflows/build-report.yml +++ b/.github/workflows/build-report.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: test_set: [ general, firestore ] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: generate-report-${{ matrix.test_set }} steps: - name: Pause 5 minutes to offset Firestore fetches. diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 235fd4dae0..c1ee5375f0 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -17,7 +17,7 @@ concurrency: jobs: file_format_check: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: @@ -40,7 +40,7 @@ jobs: check_integration_test_labels: # This check fails if integration tests are queued, in progress, or failed. - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: docker://agilepathway/pull-request-label-checker:latest with: @@ -49,7 +49,7 @@ jobs: generated_docs_check: # This check succeeds if Doxygen documentation generates without errors. - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: @@ -88,7 +88,7 @@ jobs: copyright_check: # Check for Google copyright in each file. - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: @@ -100,7 +100,7 @@ jobs: release_notes_check: # Check that the readme was updated, unless the PR has a specific label set (env.skipReleaseNotesLabel). - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 # Skip this if the PR has the skipReleaseNotes label or if it's a merge to other than main. diff --git a/.github/workflows/checks_secure.yml b/.github/workflows/checks_secure.yml index aada0f81ac..c919b374b6 100644 --- a/.github/workflows/checks_secure.yml +++ b/.github/workflows/checks_secure.yml @@ -12,7 +12,7 @@ concurrency: jobs: dismiss_stale_approvals: # Dismiss stale approvals for users without write access, or if this PR comes from a fork. - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # Only if another commit was added to the PR. steps: - name: Check user permission diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index dd8fff4217..67f498cb8c 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -42,7 +42,7 @@ env: jobs: log_inputs: name: log-inputs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: log run inputs run: | @@ -79,9 +79,9 @@ jobs: if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} strategy: matrix: - os: [ubuntu-20.04, macos-13] + os: [ubuntu-22.04, macos-13] include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 tools_platform: linux # Binutils 2.35.1 released Sep 19, 2020 binutils_version: "2.35.1" @@ -243,7 +243,7 @@ jobs: build_and_package_android: name: build-and-package-android - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} strategy: fail-fast: false @@ -308,7 +308,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, ubuntu-20.04, macos-13] + os: [windows-latest, ubuntu-22.04, macos-13] build_type: ["Release", "Debug"] architecture: ["x64", "x86", "arm64"] msvc_runtime: ["static", "dynamic"] @@ -322,7 +322,7 @@ jobs: msvc_runtime: "dynamic" vcpkg_triplet_suffix: "windows-static-md" sdk_platform: "windows" - - os: ubuntu-20.04 + - os: ubuntu-22.04 vcpkg_triplet_suffix: "linux" additional_build_flags: "" sdk_platform: "linux" @@ -342,11 +342,11 @@ jobs: linux_abi: "c++11" - os: macos-13 build_type: "Debug" - - os: ubuntu-20.04 + - os: ubuntu-22.04 msvc_runtime: "dynamic" - - os: ubuntu-20.04 + - os: ubuntu-22.04 build_type: "Debug" - - os: ubuntu-20.04 + - os: ubuntu-22.04 architecture: "arm64" - os: windows-latest architecture: "arm64" @@ -465,40 +465,40 @@ jobs: matrix: sdk_platform: [linux, darwin, windows] suffix: [''] - runs_on_platform: [ubuntu-20.04] + runs_on_platform: [ubuntu-22.04] include: # Split windows packaging into multiple runners. - sdk_platform: windows suffix: '-x86-Release-static' - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 - sdk_platform: windows suffix: '-x86-Release-dynamic' - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 - sdk_platform: windows suffix: '-x64-Release-static' - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 - sdk_platform: windows suffix: '-x64-Release-dynamic' - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 - sdk_platform: windows suffix: '-x86-Debug-static' - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 - sdk_platform: windows suffix: '-x86-Debug-dynamic' - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 - sdk_platform: windows suffix: '-x64-Debug-static' - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 - sdk_platform: windows suffix: '-x64-Debug-dynamic' - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 - sdk_platform: darwin runs_on_platform: macos-13 exclude: - sdk_platform: windows suffix: '' - sdk_platform: darwin - runs_on_platform: ubuntu-20.04 + runs_on_platform: ubuntu-22.04 steps: - name: setup Xcode version (macos) if: runner.os == 'macOS' @@ -656,7 +656,7 @@ jobs: download_sdk_package: name: download-sdk-package - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [log_inputs] if: ${{ github.event.inputs.downloadPublicVersion != '' || github.event.inputs.downloadPreviousRun != '' }} steps: @@ -706,7 +706,7 @@ jobs: merge_packages: name: final-merge-packages - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }} needs: [build_and_package_ios_tvos, build_and_package_android, package_desktop, log_inputs] steps: @@ -767,7 +767,7 @@ jobs: create_windows_only_package: name: create-windows-only-package - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [merge_packages] steps: - name: download SDK zip @@ -814,7 +814,7 @@ jobs: # Clean up intermediate artifacts from packaging step. # This can happen after the final package merge is finished. name: cleanup-packaging-artifacts - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [merge_packages] if: | ( @@ -835,7 +835,7 @@ jobs: # Trigger the integration_tests workflow. needs: [merge_packages, download_sdk_package, create_windows_only_package, cleanup_packaging_artifacts] if: (github.event.inputs.skipIntegrationTests == 0 || github.event.inputs.skipIntegrationTests == '') && !cancelled() && !failure() - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout repo uses: actions/checkout@v3 @@ -904,7 +904,7 @@ jobs: attempt_retry: name: "attempt-retry" needs: [trigger_integration_tests] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ failure() && !cancelled() && github.event_name == 'schedule' }} steps: - name: Checkout repo diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index a1bd06c5ae..e0066aa268 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -20,7 +20,7 @@ concurrency: jobs: prepare_matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: matrix_os: ${{ steps.export-result.outputs.matrix_os }} matrix_build_type: ${{ steps.export-result.outputs.matrix_build_type }} @@ -70,7 +70,7 @@ jobs: msvc_runtime: "dynamic" exclude: # msvc_runtime excludes - - os: ubuntu-20.04 + - os: ubuntu-22.04 msvc_runtime: "dynamic" - os: macos-13 msvc_runtime: "dynamic" @@ -78,16 +78,16 @@ jobs: - os: macos-13 architecture: "x86" # Xcode excludes -- allow only one on osx and linux - - os: ubuntu-20.04 + - os: ubuntu-22.04 xcode_version: "11.7" - os: windows-latest xcode_version: "11.7" - - os: ubuntu-20.04 + - os: ubuntu-22.04 xcode_version: "12.5.1" - os: windows-latest xcode_version: "12.5.1" # arm64 is only for macos - - os: ubuntu-20.04 + - os: ubuntu-22.04 architecture: "arm64" - os: windows-latest architecture: "arm64" @@ -292,7 +292,7 @@ jobs: ### It's possible to add more apps here once integration tests are less flaky. name: local-integration-tests-linux-openssl needs: prepare_matrix - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false steps: @@ -331,7 +331,7 @@ jobs: python scripts/gha/build_testapps.py --p Desktop \ --t ${apis} \ --output_directory "${{ github.workspace }}" \ - --artifact_name "desktop-ubuntu-20.04-openssl" \ + --artifact_name "desktop-ubuntu-22.04-openssl" \ --noadd_timestamp \ --short_output_paths \ --cmake_flag=-DFIREBASE_QUICK_TEST=ON @@ -339,7 +339,7 @@ jobs: if: ${{ !cancelled() }} shell: bash run: | - cat build-results-desktop-ubuntu-20.04-openssl.log + cat build-results-desktop-ubuntu-22.04-openssl.log if [[ "${{ job.status }}" != "success" ]]; then exit 1 fi @@ -361,15 +361,15 @@ jobs: java-version: '17' - name: Run Desktop integration tests run: | - cp scripts/gha/integration_testing/google-services.json testapps-desktop-ubuntu-20.04-openssl/firestore/google-services.json - 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"' + cp scripts/gha/integration_testing/google-services.json testapps-desktop-ubuntu-22.04-openssl/firestore/google-services.json + 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"' env: USE_FIRESTORE_EMULATOR: true - name: Summarize test results if: ${{ !cancelled() }} shell: bash run: | - cat testapps-desktop-ubuntu-20.04-openssl/test-results-desktop-ubuntu-20.04-openssl.log + cat testapps-desktop-ubuntu-22.04-openssl/test-results-desktop-ubuntu-22.04-openssl.log if [[ "${{ job.status }}" != "success" ]]; then exit 1 fi diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 634a93f6df..2203265dda 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -21,7 +21,7 @@ on: required: true operating_systems: description: 'CSV of VMs to run on' - default: 'ubuntu-20.04,windows-latest,macos-13' + default: 'ubuntu-22.04,windows-latest,macos-13' required: true desktop_ssl_variants: description: 'CSV of desktop SSL variants to use' @@ -58,7 +58,7 @@ env: jobs: check_and_prepare: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: trigger: ${{ steps.set_outputs.outputs.trigger }} github_ref: ${{ steps.set_outputs.outputs.github_ref }} @@ -204,7 +204,7 @@ jobs: # at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo echo "::warning ::Running against Firestore tip-of-tree" matrix_platform="Desktop" - matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-20.04,macos-13") + matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-22.04,macos-13") else matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} ) matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}") @@ -268,7 +268,7 @@ jobs: # Do not attempt to use arm64 on Windows or Linux. - os: windows-latest arch: arm64 - - os: ubuntu-20.04 + - os: ubuntu-22.04 arch: arm64 # Do not attempt to use x86 on Mac. - os: macos-13 @@ -750,7 +750,7 @@ jobs: # Do not attempt to use arm64 on Windows or Linux. - os: windows-latest arch: arm64 - - os: ubuntu-20.04 + - os: ubuntu-22.04 arch: arm64 # Do not attempt to use x86 on Mac. - os: macos-13 @@ -867,7 +867,7 @@ jobs: test_android: name: test-android-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }} needs: [check_and_prepare, build_android] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Android') && needs.check_and_prepare.outputs.apis != '' && !cancelled() strategy: fail-fast: false @@ -1313,7 +1313,7 @@ jobs: summarize_results: name: "summarize-results" needs: [check_and_prepare, test_desktop, test_android, test_ios, test_tvos] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ !cancelled() }} steps: - uses: actions/checkout@v3 @@ -1381,7 +1381,7 @@ jobs: attempt_retry: name: "attempt-retry" needs: [check_and_prepare, summarize_results] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ failure() && needs.check_and_prepare.outputs.trigger == 'scheduled_trigger' }} steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index ce025f1adb..45dbe79caf 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -19,7 +19,7 @@ concurrency: jobs: prepare_matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: matrix_xcode_version: ${{ steps.export-result.outputs.matrix_xcode_version }} steps: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d8f4149e56..dbe4114141 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,7 +10,7 @@ concurrency: jobs: lint_warnings_check_and_comment: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/retry-test-failures.yml b/.github/workflows/retry-test-failures.yml index c49ce7f8bd..188e4ae7a7 100644 --- a/.github/workflows/retry-test-failures.yml +++ b/.github/workflows/retry-test-failures.yml @@ -10,7 +10,7 @@ on: jobs: check_results_and_retry_if_needed: name: check-results-and-retry-if-needed - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Get token for firebase-workflow-trigger uses: tibdex/github-app-token@v1 diff --git a/.github/workflows/reviewer-roulette.yml b/.github/workflows/reviewer-roulette.yml index e72efb7e91..8388bd06e7 100644 --- a/.github/workflows/reviewer-roulette.yml +++ b/.github/workflows/reviewer-roulette.yml @@ -10,7 +10,7 @@ env: jobs: assign_random_reviewer: if: github.event.action == 'labeled' && github.event.label.name == 'reviewer-roulette' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Unset label uses: buildsville/add-remove-label@v1 diff --git a/.github/workflows/update-feature-branches.yml b/.github/workflows/update-feature-branches.yml index 8f9c2023a2..b39ad3e279 100644 --- a/.github/workflows/update-feature-branches.yml +++ b/.github/workflows/update-feature-branches.yml @@ -23,7 +23,7 @@ env: jobs: list_feature_branches: name: list-feature-branches - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: branch_list: ${{ steps.get-branches.outputs.branch_list }} steps: @@ -57,7 +57,7 @@ jobs: create_merge_prs: name: create-merge-pr-${{ matrix.branch_name }} needs: [ list_feature_branches ] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ needs.list_feature_branches.outputs.branch_list != '[]' }} strategy: fail-fast: false From fd27df86abfd10aebbc3d7adb96e22d82024957e Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Fri, 14 Feb 2025 12:03:59 -0800 Subject: [PATCH 02/18] Also update the generated matrix. --- scripts/gha/print_matrix_configuration.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index ad88486501..e41c70f5ac 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -73,7 +73,7 @@ PARAMETERS = { "desktop": { "matrix": { - "os": ["ubuntu-20.04", "macos-13"], + "os": ["ubuntu-22.04", "macos-13"], "build_type": ["Release", "Debug"], "architecture": ["x64", "x86"], "msvc_runtime": ["static","dynamic"], @@ -81,7 +81,7 @@ "python_version": ["3.7"], EXPANDED_KEY: { - "os": ["ubuntu-20.04", "macos-13", "windows-latest"], + "os": ["ubuntu-22.04", "macos-13", "windows-latest"], "xcode_version": ["15.1"], } } @@ -89,19 +89,19 @@ "android": { "matrix": { - "os": ["ubuntu-20.04", "macos-13", "windows-latest"], + "os": ["ubuntu-22.04", "macos-13", "windows-latest"], "architecture": ["x64"], "python_version": ["3.7"], EXPANDED_KEY: { - "os": ["ubuntu-20.04", "macos-13", "windows-latest"] + "os": ["ubuntu-22.04", "macos-13", "windows-latest"] } } }, "integration_tests": { "matrix": { - "os": ["ubuntu-20.04", "macos-13", "windows-latest"], + "os": ["ubuntu-22.04", "macos-13", "windows-latest"], "platform": ["Desktop", "Android", "iOS", "tvOS"], "ssl_lib": ["openssl"], "android_device": ["android_target", "emulator_ftl_target"], @@ -119,7 +119,7 @@ "build_tools_version": ["28.0.3"], MINIMAL_KEY: { - "os": ["ubuntu-20.04"], + "os": ["ubuntu-22.04"], "platform": ["Desktop"], "apis": "firestore" }, @@ -299,9 +299,9 @@ def print_value(value): """ Print Json formatted string that can be consumed in Github workflow.""" # Eg: for lists, # print(json.dumps) -> - # ["ubuntu-20.04", "macos-latest", "windows-latest"] + # ["ubuntu-22.04", "macos-latest", "windows-latest"] # print(repr(json.dumps)) -> - # '["ubuntu-20.04", "macos-latest", "windows-latest"]' + # '["ubuntu-22.04", "macos-latest", "windows-latest"]' # Eg: for strings # print(json.dumps) -> "flame" From e36be60c60d24882d23339283cc698322e92c0ed Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:10:55 -0800 Subject: [PATCH 03/18] Don't remove PCRE packages --- scripts/gha/utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index adeb805d35..f8489d999c 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -252,11 +252,11 @@ def install_x86_support_libraries(gha_build=False): check=True) run_command(['apt', 'update'], as_root=True, check=True) run_command(['apt', 'install', 'aptitude'], as_root=True, check=True) - if gha_build: - # Remove libpcre to prevent package conflicts. - # Only remove packages on GitHub runners. - remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64', - 'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64'] + #if gha_build: + # Remove libpcre to prevent package conflicts. + # Only remove packages on GitHub runners. + # remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64', + # 'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64'] # Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-' # in the package list. run_command(['aptitude', 'install', '-V', '-y'] + packages + From 1a3c16702bcd0516611d175ab42f34db41b7f79c Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:19:59 -0800 Subject: [PATCH 04/18] Attempt to remove libpcre3. --- scripts/gha/utils.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index f8489d999c..654dae6f72 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -252,11 +252,13 @@ def install_x86_support_libraries(gha_build=False): check=True) run_command(['apt', 'update'], as_root=True, check=True) run_command(['apt', 'install', 'aptitude'], as_root=True, check=True) - #if gha_build: - # Remove libpcre to prevent package conflicts. - # Only remove packages on GitHub runners. - # remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64', - # 'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64'] + if gha_build: + # Remove libpcre to prevent package conflicts. + # Only remove packages on GitHub runners. + remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64', + 'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64', + 'libpcre3-dev:amd64', 'libpcre3-0:amd64', + 'libpcre16-0:amd64', 'libpcre32-0:amd64'] # Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-' # in the package list. run_command(['aptitude', 'install', '-V', '-y'] + packages + From cdd16f7d5545a195be0e0fbe3faf6c4d83af1ed8 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:25:04 -0800 Subject: [PATCH 05/18] Add missing libpcre2. --- scripts/gha/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index 654dae6f72..b06515873d 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -237,7 +237,8 @@ def install_x86_support_libraries(gha_build=False): if is_linux_os(): packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', - 'libssl-dev:i386', 'libsecret-1-0:i386'] + 'libssl-dev:i386', 'libsecret-1-0:i386', + 'libpcre2-dev:i386'] remove_packages = [] # First check if these packages exist on the machine already From 49598c3dd30f39a9bd0632d65f806f92c745d046 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:26:54 -0800 Subject: [PATCH 06/18] Use updated posix library. --- scripts/gha/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index b06515873d..5f81045f63 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -238,7 +238,7 @@ def install_x86_support_libraries(gha_build=False): packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', 'libssl-dev:i386', 'libsecret-1-0:i386', - 'libpcre2-dev:i386'] + 'libpcre2-posix2:i386'] remove_packages = [] # First check if these packages exist on the machine already From ba2aa63467bbd116f0db774e8d9f1652b0659bf0 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:31:06 -0800 Subject: [PATCH 07/18] Update PCRE package list. --- scripts/gha/utils.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index 5f81045f63..c3d51ec136 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -237,8 +237,7 @@ def install_x86_support_libraries(gha_build=False): if is_linux_os(): packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', - 'libssl-dev:i386', 'libsecret-1-0:i386', - 'libpcre2-posix2:i386'] + 'libssl-dev:i386', 'libsecret-1-0:i386'] remove_packages = [] # First check if these packages exist on the machine already @@ -256,10 +255,8 @@ def install_x86_support_libraries(gha_build=False): if gha_build: # Remove libpcre to prevent package conflicts. # Only remove packages on GitHub runners. - remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64', - 'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64', - 'libpcre3-dev:amd64', 'libpcre3-0:amd64', - 'libpcre16-0:amd64', 'libpcre32-0:amd64'] + remove_packages = ['libpcre2-16-0:amd64', 'libpcre2-32-0:amd64', 'libpcre2-8-0:amd64', + 'libpcre2-posix3:amd64', 'libpcre2-dev:amd64', 'pcre2-utils:amd64'] # Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-' # in the package list. run_command(['aptitude', 'install', '-V', '-y'] + packages + From 3598b15253258db45a0f8e99ebb0622829987d65 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:33:44 -0800 Subject: [PATCH 08/18] Add missing libgcc package. --- scripts/gha/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index c3d51ec136..7b4f98d66b 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -237,7 +237,7 @@ def install_x86_support_libraries(gha_build=False): if is_linux_os(): packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', - 'libssl-dev:i386', 'libsecret-1-0:i386'] + 'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386'] remove_packages = [] # First check if these packages exist on the machine already From 32a79229056a2375f49a8c2d450daf4a38074f13 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:37:24 -0800 Subject: [PATCH 09/18] Add another package. --- scripts/gha/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index 7b4f98d66b..89cf6134d9 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -237,7 +237,8 @@ def install_x86_support_libraries(gha_build=False): if is_linux_os(): packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', - 'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386'] + 'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386', + 'gcc-10-base:i386'] remove_packages = [] # First check if these packages exist on the machine already From 8ecf9b397e0e2c6117a3e7f2d08fc00ae9c16fa4 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:42:31 -0800 Subject: [PATCH 10/18] Try the cross compilation package. --- scripts/gha/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index 89cf6134d9..6bb8b5730f 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -238,7 +238,7 @@ def install_x86_support_libraries(gha_build=False): packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', 'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386', - 'gcc-10-base:i386'] + 'gcc-10-base:i386', 'libgcc-s1-i386-cross'] remove_packages = [] # First check if these packages exist on the machine already From 39ca68d74ffd7bdcb871b2d4513ae544454c21d2 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:50:54 -0800 Subject: [PATCH 11/18] Print out all the installed libraries for diagnosis. --- .github/workflows/cpp-packaging.yml | 4 +++- scripts/gha/utils.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 67f498cb8c..64603910f4 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -409,7 +409,9 @@ jobs: max_attempts: 3 command: | python scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.architecture }}' --ssl boringssl - + if [[ "${{ matrix.architecture }}" == "x86" ]]; then + find /usr/lib /usr/lib/gcc -print + fi - name: Export verbose flag shell: bash run: | diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index 6bb8b5730f..89cf6134d9 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -238,7 +238,7 @@ def install_x86_support_libraries(gha_build=False): packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', 'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386', - 'gcc-10-base:i386', 'libgcc-s1-i386-cross'] + 'gcc-10-base:i386'] remove_packages = [] # First check if these packages exist on the machine already From e749f377756b3c494528e00593edb900ab73308f Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 12:51:30 -0800 Subject: [PATCH 12/18] Remove tabs. --- .github/workflows/cpp-packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 64603910f4..6540f096bb 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -410,7 +410,7 @@ jobs: command: | python scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.architecture }}' --ssl boringssl if [[ "${{ matrix.architecture }}" == "x86" ]]; then - find /usr/lib /usr/lib/gcc -print + find /usr/lib /usr/lib/gcc -print fi - name: Export verbose flag shell: bash From 132056dd10de0ec3ec6ded6a82f6c4bf245871de Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 14:03:01 -0800 Subject: [PATCH 13/18] Add another diagnostic command. --- .github/workflows/cpp-packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 6540f096bb..5b556f6f06 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -410,7 +410,7 @@ jobs: command: | python scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.architecture }}' --ssl boringssl if [[ "${{ matrix.architecture }}" == "x86" ]]; then - find /usr/lib /usr/lib/gcc -print + dpkg -L gcc-multilib fi - name: Export verbose flag shell: bash From 08d1412c79b5f8d51a3a17995a2bf7edeea5d889 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 14:38:14 -0800 Subject: [PATCH 14/18] Force GCC 10 multilib. --- scripts/gha/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index 89cf6134d9..0bddfc7bff 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -235,7 +235,7 @@ def install_x86_support_libraries(gha_build=False): downgrading Ubuntu packages). """ if is_linux_os(): - packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', + packages = ['gcc-10-multilib', 'g++-10-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', 'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386', 'gcc-10-base:i386'] From 9ede958dac2ea15176d13d50d1abfc140e7b057b Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 14:42:24 -0800 Subject: [PATCH 15/18] Remove x86 Linux support. --- .github/workflows/cpp-packaging.yml | 2 ++ .github/workflows/desktop.yml | 2 ++ .github/workflows/integration_tests.yml | 8 ++++++-- scripts/gha/print_matrix_configuration.py | 4 ++-- scripts/gha/utils.py | 9 ++++----- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 5b556f6f06..2fe87fe723 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -342,6 +342,8 @@ jobs: linux_abi: "c++11" - os: macos-13 build_type: "Debug" + - os: ubuntu-22.04 + architecture: "x86" - os: ubuntu-22.04 msvc_runtime: "dynamic" - os: ubuntu-22.04 diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index e0066aa268..9d0664b289 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -77,6 +77,8 @@ jobs: # architecture excluees - os: macos-13 architecture: "x86" + - os: ubuntu-22.04 + architecture: "x86" # Xcode excludes -- allow only one on osx and linux - os: ubuntu-22.04 xcode_version: "11.7" diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 2203265dda..905100babd 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -270,9 +270,11 @@ jobs: arch: arm64 - os: ubuntu-22.04 arch: arm64 - # Do not attempt to use x86 on Mac. + # Do not attempt to use x86 on Mac or Linux. - os: macos-13 arch: x86 + - os: ubuntu-22.04 + arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all # happen on x64 machines, so arm64 and x86 are technically @@ -752,9 +754,11 @@ jobs: arch: arm64 - os: ubuntu-22.04 arch: arm64 - # Do not attempt to use x86 on Mac. + # Do not attempt to use x86 on Mac or Linux. - os: macos-13 arch: x86 + - os: ubuntu-22.04 + arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all # happen on x64 machines, so arm64 and x86 are technically diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index e41c70f5ac..92fa274335 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -75,7 +75,7 @@ "matrix": { "os": ["ubuntu-22.04", "macos-13"], "build_type": ["Release", "Debug"], - "architecture": ["x64", "x86"], + "architecture": ["x64"], "msvc_runtime": ["static","dynamic"], "xcode_version": ["15.1"], "python_version": ["3.7"], @@ -129,7 +129,7 @@ "android_device": ["android_target", "android_latest", "emulator_ftl_target", "emulator_ftl_latest"], "ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"], "tvos_device": ["tvos_simulator"], - "architecture_windows_linux": ["x64", "x86"], + "architecture_windows_linux": ["x64"], "architecture_macos": ["x64"], } }, diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index 0bddfc7bff..adeb805d35 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -235,10 +235,9 @@ def install_x86_support_libraries(gha_build=False): downgrading Ubuntu packages). """ if is_linux_os(): - packages = ['gcc-10-multilib', 'g++-10-multilib', 'libglib2.0-dev:i386', + packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', - 'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386', - 'gcc-10-base:i386'] + 'libssl-dev:i386', 'libsecret-1-0:i386'] remove_packages = [] # First check if these packages exist on the machine already @@ -256,8 +255,8 @@ def install_x86_support_libraries(gha_build=False): if gha_build: # Remove libpcre to prevent package conflicts. # Only remove packages on GitHub runners. - remove_packages = ['libpcre2-16-0:amd64', 'libpcre2-32-0:amd64', 'libpcre2-8-0:amd64', - 'libpcre2-posix3:amd64', 'libpcre2-dev:amd64', 'pcre2-utils:amd64'] + remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64', + 'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64'] # Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-' # in the package list. run_command(['aptitude', 'install', '-V', '-y'] + packages + From e30fd376c313205985f8249046ddc503733bc3d3 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 14:46:21 -0800 Subject: [PATCH 16/18] Remove debug output. --- .github/workflows/cpp-packaging.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 5b556f6f06..706a30515a 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -409,9 +409,6 @@ jobs: max_attempts: 3 command: | python scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.architecture }}' --ssl boringssl - if [[ "${{ matrix.architecture }}" == "x86" ]]; then - dpkg -L gcc-multilib - fi - name: Export verbose flag shell: bash run: | From cabc9c2c277c7cc29570e7916835b0cae4e612c2 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 14:48:21 -0800 Subject: [PATCH 17/18] Revert "Remove x86 Linux support." This reverts commit 9ede958dac2ea15176d13d50d1abfc140e7b057b. --- .github/workflows/cpp-packaging.yml | 2 -- .github/workflows/desktop.yml | 2 -- .github/workflows/integration_tests.yml | 8 ++------ scripts/gha/print_matrix_configuration.py | 4 ++-- scripts/gha/utils.py | 9 +++++---- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 060e48a103..706a30515a 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -342,8 +342,6 @@ jobs: linux_abi: "c++11" - os: macos-13 build_type: "Debug" - - os: ubuntu-22.04 - architecture: "x86" - os: ubuntu-22.04 msvc_runtime: "dynamic" - os: ubuntu-22.04 diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 9d0664b289..e0066aa268 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -77,8 +77,6 @@ jobs: # architecture excluees - os: macos-13 architecture: "x86" - - os: ubuntu-22.04 - architecture: "x86" # Xcode excludes -- allow only one on osx and linux - os: ubuntu-22.04 xcode_version: "11.7" diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 905100babd..2203265dda 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -270,11 +270,9 @@ jobs: arch: arm64 - os: ubuntu-22.04 arch: arm64 - # Do not attempt to use x86 on Mac or Linux. + # Do not attempt to use x86 on Mac. - os: macos-13 arch: x86 - - os: ubuntu-22.04 - arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all # happen on x64 machines, so arm64 and x86 are technically @@ -754,11 +752,9 @@ jobs: arch: arm64 - os: ubuntu-22.04 arch: arm64 - # Do not attempt to use x86 on Mac or Linux. + # Do not attempt to use x86 on Mac. - os: macos-13 arch: x86 - - os: ubuntu-22.04 - arch: x86 # Until we support building openssl from source, we can't use the # system's openssl when cross-compiling, except on Linux. Builds all # happen on x64 machines, so arm64 and x86 are technically diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 92fa274335..e41c70f5ac 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -75,7 +75,7 @@ "matrix": { "os": ["ubuntu-22.04", "macos-13"], "build_type": ["Release", "Debug"], - "architecture": ["x64"], + "architecture": ["x64", "x86"], "msvc_runtime": ["static","dynamic"], "xcode_version": ["15.1"], "python_version": ["3.7"], @@ -129,7 +129,7 @@ "android_device": ["android_target", "android_latest", "emulator_ftl_target", "emulator_ftl_latest"], "ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"], "tvos_device": ["tvos_simulator"], - "architecture_windows_linux": ["x64"], + "architecture_windows_linux": ["x64", "x86"], "architecture_macos": ["x64"], } }, diff --git a/scripts/gha/utils.py b/scripts/gha/utils.py index adeb805d35..0bddfc7bff 100644 --- a/scripts/gha/utils.py +++ b/scripts/gha/utils.py @@ -235,9 +235,10 @@ def install_x86_support_libraries(gha_build=False): downgrading Ubuntu packages). """ if is_linux_os(): - packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386', + packages = ['gcc-10-multilib', 'g++-10-multilib', 'libglib2.0-dev:i386', 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386', - 'libssl-dev:i386', 'libsecret-1-0:i386'] + 'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386', + 'gcc-10-base:i386'] remove_packages = [] # First check if these packages exist on the machine already @@ -255,8 +256,8 @@ def install_x86_support_libraries(gha_build=False): if gha_build: # Remove libpcre to prevent package conflicts. # Only remove packages on GitHub runners. - remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64', - 'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64'] + remove_packages = ['libpcre2-16-0:amd64', 'libpcre2-32-0:amd64', 'libpcre2-8-0:amd64', + 'libpcre2-posix3:amd64', 'libpcre2-dev:amd64', 'pcre2-utils:amd64'] # Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-' # in the package list. run_command(['aptitude', 'install', '-V', '-y'] + packages + From 4925dd9d6f81c5346dfa27ac3db8cfa49e07e74c Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 5 Mar 2025 19:52:18 -0800 Subject: [PATCH 18/18] Update permissions. --- .github/workflows/integration_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 2203265dda..25eefdf7f6 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -42,6 +42,8 @@ on: firestore_dep_source: description: 'Optional: Where to get firestore iOS SDK from: "RELEASED", "TIP" or " from firestore-ios-sdk"' +permissions: write-all + env: triggerLabelPrefix: "tests-requested: " triggerLabelFull: "tests-requested: full"