Fix openssl build for x86_64 Mac build.

Author: jonsimantov

.github/workflows/integration_tests.yml

@@ -52,11 +52,6 @@ env:
   xcodeVersion: '16.2'
   artifactRetentionDays: 2
   GITHUB_TOKEN: ${{ github.token }}
-  # All self-hosted ARM Mac runners should have this label. Due to how
-  # our custom reporting works, it must be exactly two words separated
-  # by a hyphen. The first word must be "macos". The second word will
-  # be omitted from the summary log.
-  runnerLabelMacArm64: "macos-m1custom"
 
 jobs:
   check_and_prepare:
@@ -77,8 +72,6 @@ jobs:
       xcode_version: ${{ steps.matrix_config.outputs.xcode_version }}
       ios_device: ${{ steps.matrix_config.outputs.ios_device }}
       tvos_device: ${{ steps.matrix_config.outputs.tvos_device }}
-      # Copy the runner label here because matrix specifiers cannot see env.
-      runner_label_macos_arm64: ${{ env.runnerLabelMacArm64 }}
     steps:
     ### Fail the workflow if the user does not have admin access to run the tests.
     - name: Check if user has permission to trigger tests
@@ -276,15 +269,15 @@ jobs:
         - os: macos-14
           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
-        # cross-compiling.
+        # system's openssl when cross-compiling, except on Linux. Builds on Linux
+        # happen on x64 machines, so x86 is technically cross-compiling. Builds on
+        # Mac happen on arm64 machines, so x64 is technically cross-compiling.
         - os: windows-latest
           ssl_variant: openssl
           arch: x86
         - os: macos-14
           ssl_variant: openssl
-          arch: arm64
+          arch: x64
     steps:
       - uses: lukka/get-cmake@latest
         with:
@@ -775,17 +768,15 @@ jobs:
         - os: macos-14
           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
-        # cross-compiling.
+        # system's openssl when cross-compiling, except on Linux. Builds on Linux
+        # happen on x64 machines, so x86 is technically cross-compiling. Builds on
+        # Mac happen on arm64 machines, so x64 is technically cross-compiling.
         - os: windows-latest
           ssl_variant: openssl
           arch: x86
-        # Custom for this matrix: MacOS GitHub-hosted runner cannot test arm64
-        # code. Exclude that scenario from running here; it will run in
-        # test_desktop_custom_runners.
         - os: macos-14
-          arch: arm64
+          ssl_variant: openssl
+          arch: x64
     steps:
       - uses: actions/checkout@v3
         with: