Disable custom runner.

Author: jonsimantov

.github/workflows/integration_tests.yml

@@ -864,158 +864,6 @@ jobs:
  exit 1
  fi
 
-# Run tests that depend on custom (self-hosted) runners.
-# For now, this is only used for ARM Mac builds.
-test_desktop_custom_runners:
-name: test-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}-custom-runner
-needs: [check_and_prepare, build_desktop]
-runs-on: [self-hosted, firebase-cpp, '${{ matrix.runner_label }}']
-if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Desktop') && contains(needs.check_and_prepare.outputs.matrix_arch_combined, 'arm64') && contains(needs.check_and_prepare.outputs.matrix_os, 'macos-13') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
-strategy:
-fail-fast: false
-matrix:
-ssl_variant: ${{ fromJson(needs.check_and_prepare.outputs.matrix_ssl) }}
-os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
-arch: ${{ fromJson(needs.check_and_prepare.outputs.matrix_arch_combined) }}
-runner_label: ['${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }}']
-exclude:
-# Don't run Linux or Windows tests on the Mac arm64 runner.
- - os: ubuntu-20.04
-runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }}
- - os: windows-latest
-runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }}
-# Don't run x86 tests on any Mac runner.
- - os: macos-13
-arch: x86
-# Don't run x64 tests on the Mac arm64 runner.
- - os: macos-13
-arch: x64
-runner_label: ${{ needs.check_and_prepare.outputs.runner_label_macos_arm64 }}
-# Until we support building openssl from source, we can't link to system
-# openssl when cross-compiling, so exclude openssl from mac arm64 testing.
- - os: macos-13
-arch: arm64
-ssl_variant: openssl
-steps:
- - name: Clean up previous run
-shell: bash
-run: |
- echo "Cleaning up previous run"
- rm -rf "${{ github.workspace }}"/*
- - uses: actions/checkout@v3
-with:
-ref: ${{needs.check_and_prepare.outputs.github_ref}}
- - name: Download Desktop integration tests artifact
-uses: actions/download-artifact@v3
-with:
-path: testapps
-name: testapps-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}
-# Omit all of the prerequisites steps; we ensure that our self-hosted runners
-# are configured with all prereqs already installed.
- - name: Create keychain (macOS)
-if: ${{ runner.os == 'macOS' }}
-shell: bash
-run: |
- echo "Creating temporary keychain"
- # Create a local keychain on Mac:
- # Clean up previous temp keychain, if any.
- security delete-keychain tmp-keychain 2> /dev/null || true
- # Create temp keychain file and unlock it.
- # (Avoid passing in -p on command line by using interactive mode.)
- # Also set it to default settings so there is no unlock timeout.
- security -i <<EOF
- create-keychain -p ${{ secrets.TEST_SECRET }} tmp-keychain
- set-keychain-settings tmp-keychain
- unlock-keychain -p ${{ secrets.TEST_SECRET }} tmp-keychain
- EOF
- # Change the keychain list and default keychain to the temp keychain.
- security list-keychains -d user -s tmp-keychain
- security default-keychain -s tmp-keychain
- - name: Restore google-services files
-shell: bash
-run: |
- python scripts/gha/restore_secrets.py --passphrase_file=- --artifact testapps <<EOF
- ${{ secrets.TEST_SECRET }}
- EOF
- - name: Run Desktop integration tests on M1 Mac
-if: ${{ matrix.os == 'macos-13' && matrix.arch == 'arm64' && matrix.runner_label == needs.check_and_prepare.outputs.runner_label_macos_arm64 }}
-shell: bash
-run: |
- # This is an M1 Mac GitHub self-hosted runner.
- # Use arch command to ensure that the app is running in the correct processor mode (arm64).
- cmd_prefix='arch -arm64'
-
- # If Firestore is included, use the emulator; otherwise just run the tests standalone.
- if [[ "${{ needs.check_and_prepare.outputs.apis }}" == *"firestore"* ]]; then
- # ARM Mac requires a firestore.json to specify the host as 127.0.0.1 rather than localhost.
- # Otherwise the Firestore emulator cannot connect, probably because localhost is ipv6.
- echo '{"emulators":{"firestore":{"port":"8080","host":"127.0.0.1"}}}' > firebase.json
- echo "::warning ::Firestore emulator version: $(firebase --version)"
- set -x
- firebase emulators:exec --only firestore --project demo-example \
- 'python scripts/gha/desktop_tester.py --testapp_dir testapps --logfile_name "desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}" --cmd_prefix='"\"${cmd_prefix}\""
- else
- set -x
- python scripts/gha/desktop_tester.py --testapp_dir testapps --logfile_name "desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}" --cmd_prefix="${cmd_prefix}"
- fi
-env:
-USE_FIRESTORE_EMULATOR: true
- - name: Delete keychain (macOS)
-if: ${{ always() && runner.os == 'macOS' }}
-shell: bash
-run: |
- # Remove the local keychain on Mac:
- # Set back to the default login keychain.
- security list-keychains -d user -s login.keychain
- # Delete the temp keychain, if it exists.
- security delete-keychain tmp-keychain || true
- - name: Prepare results summary artifact
-if: ${{ !cancelled() }}
-shell: bash
-run: |
- if [ ! -f testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.arch}}-${{ matrix.ssl_variant }}.log.json ]; then
- mkdir -p testapps && echo "__SUMMARY_MISSING__" > testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.arch}}-${{ matrix.ssl_variant }}.log.json
- fi
- - name: Upload Desktop test results artifact
-if: ${{ !cancelled() }}
-uses: actions/upload-artifact@v3
-with:
-name: log-artifact
-path: testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}*
-retention-days: ${{ env.artifactRetentionDays }}
- - name: Download log artifacts
-if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
-uses: actions/download-artifact@v3
-with:
-path: test_results
-name: log-artifact
- - name: Update PR label and comment
-if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
-shell: bash
-run: |
- python scripts/gha/it_workflow.py --stage progress \
- --token ${{github.token}} \
- --issue_number ${{needs.check_and_prepare.outputs.pr_number}}\
- --actor ${{github.actor}} \
- --commit ${{needs.check_and_prepare.outputs.github_ref}} \
- --run_id ${{github.run_id}}
- - name: Summarize test results
-if: ${{ !cancelled() }}
-shell: bash
-run: |
- cat testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}.log
- if [[ "${{ job.status }}" != "success" ]]; then
- exit 1
- fi
- - name: Clean up after this run
-shell: bash
-if: ${{ always() }}
-run: |
- echo "Cleaning up after this run"
- rm -rf "${{ github.workspace }}"/*
-
-
-
 test_android:
 name: test-android-${{ matrix.build_os }}-${{ matrix.android_device }}-${{ matrix.test_type }}
 needs: [check_and_prepare, build_android]

scripts/gha/print_matrix_configuration.py

@@ -75,7 +75,7 @@
 "matrix": {
 "os": ["ubuntu-20.04", "macos-13"],
 "build_type": ["Release", "Debug"],
-"architecture": ["x64", "x86", "arm64"],
+"architecture": ["x64", "x86"],
 "msvc_runtime": ["static","dynamic"],
 "xcode_version": ["15.1"],
 "python_version": ["3.7"],
@@ -130,7 +130,7 @@
 "ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"],
 "tvos_device": ["tvos_simulator"],
 "architecture_windows_linux": ["x64", "x86"],
-"architecture_macos": ["x64", "arm64"],
+"architecture_macos": ["x64"],
  }
  },
 "config": {