Fix e2e tests on darwin.

Our Github darwin runners seemed to switch to arm64. This required downgrading two 3.10.11 since 3.10.12 doesn't seem available for Github + darwin, and changing the arch.
jvolkman · Apr 27, 2024 · 4a1241c · 4a1241c
1 parent e7ed313
commit 4a1241c
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 330 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -77,8 +77,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        # This needs to stay in sync with e2e/bzlmod/MODULE.bazel
-        python-version: ["3.10.12", "3.11.6", "3.12.0"]
+        # This needs to stay in sync with e2e/workspace/WORKSPACE
+        python-version: ["3.10.11", "3.11.6", "3.12.0"]
 
     defaults:
       run:
@@ -105,7 +105,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         # This needs to stay in sync with e2e/bzlmod/MODULE.bazel
-        python-version: ["3.10.12", "3.11.6", "3.12.0"]
+        python-version: ["3.10.11", "3.11.6", "3.12.0"]
     defaults:
       run:
         working-directory: e2e/bzlmod
@@ -127,7 +127,7 @@ jobs:
         run: |
           ARTIFACT_PATH="${{ runner.temp }}/testwheel-out/${{ matrix.python-version }}/${{ matrix.os }}"
           mkdir -p "$ARTIFACT_PATH"
-          for plat in macos_x86_64 linux_x86_64; do
+          for plat in macos_arm64 linux_x86_64; do
             bazel build //pdm:zstandard_build \
               --@rules_python//python/config_settings:python_version=${{ matrix.python-version }} \
               --platforms=@zig_sdk//platform:$plat \
@@ -150,7 +150,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         # This needs to stay in sync with e2e/bzlmod/MODULE.bazel
-        python-version: ["3.10.12", "3.11.6", "3.12.0"]
+        python-version: ["3.10.11", "3.11.6", "3.12.0"]
     defaults:
       run:
         working-directory: e2e/bzlmod

diff --git a/e2e/bzlmod/MODULE.bazel b/e2e/bzlmod/MODULE.bazel
@@ -34,7 +34,7 @@ register_toolchains(
 # Python
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
-python.toolchain(python_version = "3.10.12")
+python.toolchain(python_version = "3.10.11")
 
 # The default is latest - 1 to make sure nothing assumes latest == default
 python.toolchain(
@@ -54,12 +54,11 @@ environments.create_for_python_toolchains(
     name = "smoke_environments",
     platforms = [
         "aarch64-apple-darwin",
-        "x86_64-apple-darwin",
         "aarch64-unknown-linux-gnu",
         "x86_64-unknown-linux-gnu",
     ],
     python_versions = [
-        "3.10.12",
+        "3.10.11",
         "3.11.6",
         "3.12.0",
         "3.12",

diff --git a/e2e/bzlmod/lock_file/pdm_lock.bzl b/e2e/bzlmod/lock_file/pdm_lock.bzl
diff --git a/e2e/bzlmod/lock_file/poetry_lock.bzl b/e2e/bzlmod/lock_file/poetry_lock.bzl
diff --git a/e2e/workspace/WORKSPACE b/e2e/workspace/WORKSPACE
@@ -59,7 +59,7 @@ python_register_multi_toolchains(
     # The default is latest - 1 to make sure nothing assumes latest == default
     default_version = "3.11.6",
     python_versions = [
-        "3.10.12",
+        "3.10.11",
         "3.11.6",
         "3.12.0",
     ],
@@ -95,7 +95,6 @@ pycross_register_for_python_toolchains(
     name = "smoke_environments",
     platforms = [
         "aarch64-apple-darwin",
-        "x86_64-apple-darwin",
         "aarch64-unknown-linux-gnu",
         "x86_64-unknown-linux-gnu",
     ],

diff --git a/e2e/workspace/pdm/lock.bzl b/e2e/workspace/pdm/lock.bzl
@@ -43,23 +43,18 @@ def targets():
         )
 
     native.alias(
-        name = "_env_python_3.10.12_aarch64-apple-darwin",
-        actual = "@smoke_environments//:python_3.10.12_aarch64-apple-darwin_config",
+        name = "_env_python_3.10.11_aarch64-apple-darwin",
+        actual = "@smoke_environments//:python_3.10.11_aarch64-apple-darwin_config",
     )
 
     native.alias(
-        name = "_env_python_3.10.12_aarch64-unknown-linux-gnu",
-        actual = "@smoke_environments//:python_3.10.12_aarch64-unknown-linux-gnu_config",
+        name = "_env_python_3.10.11_aarch64-unknown-linux-gnu",
+        actual = "@smoke_environments//:python_3.10.11_aarch64-unknown-linux-gnu_config",
     )
 
     native.alias(
-        name = "_env_python_3.10.12_x86_64-apple-darwin",
-        actual = "@smoke_environments//:python_3.10.12_x86_64-apple-darwin_config",
-    )
-
-    native.alias(
-        name = "_env_python_3.10.12_x86_64-unknown-linux-gnu",
-        actual = "@smoke_environments//:python_3.10.12_x86_64-unknown-linux-gnu_config",
+        name = "_env_python_3.10.11_x86_64-unknown-linux-gnu",
+        actual = "@smoke_environments//:python_3.10.11_x86_64-unknown-linux-gnu_config",
     )
 
     native.alias(
@@ -72,11 +67,6 @@ def targets():
         actual = "@smoke_environments//:python_3.11.6_aarch64-unknown-linux-gnu_config",
     )
 
-    native.alias(
-        name = "_env_python_3.11.6_x86_64-apple-darwin",
-        actual = "@smoke_environments//:python_3.11.6_x86_64-apple-darwin_config",
-    )
-
     native.alias(
         name = "_env_python_3.11.6_x86_64-unknown-linux-gnu",
         actual = "@smoke_environments//:python_3.11.6_x86_64-unknown-linux-gnu_config",
@@ -92,29 +82,21 @@ def targets():
         actual = "@smoke_environments//:python_3.12.0_aarch64-unknown-linux-gnu_config",
     )
 
-    native.alias(
-        name = "_env_python_3.12.0_x86_64-apple-darwin",
-        actual = "@smoke_environments//:python_3.12.0_x86_64-apple-darwin_config",
-    )
-
     native.alias(
         name = "_env_python_3.12.0_x86_64-unknown-linux-gnu",
         actual = "@smoke_environments//:python_3.12.0_x86_64-unknown-linux-gnu_config",
     )
 
     # buildifier: disable=unused-variable
     _target = select({
-        ":_env_python_3.10.12_aarch64-apple-darwin": "@smoke_environments//:python_3.10.12_aarch64-apple-darwin.json",
-        ":_env_python_3.10.12_aarch64-unknown-linux-gnu": "@smoke_environments//:python_3.10.12_aarch64-unknown-linux-gnu.json",
-        ":_env_python_3.10.12_x86_64-apple-darwin": "@smoke_environments//:python_3.10.12_x86_64-apple-darwin.json",
-        ":_env_python_3.10.12_x86_64-unknown-linux-gnu": "@smoke_environments//:python_3.10.12_x86_64-unknown-linux-gnu.json",
+        ":_env_python_3.10.11_aarch64-apple-darwin": "@smoke_environments//:python_3.10.11_aarch64-apple-darwin.json",
+        ":_env_python_3.10.11_aarch64-unknown-linux-gnu": "@smoke_environments//:python_3.10.11_aarch64-unknown-linux-gnu.json",
+        ":_env_python_3.10.11_x86_64-unknown-linux-gnu": "@smoke_environments//:python_3.10.11_x86_64-unknown-linux-gnu.json",
         ":_env_python_3.11.6_aarch64-apple-darwin": "@smoke_environments//:python_3.11.6_aarch64-apple-darwin.json",
         ":_env_python_3.11.6_aarch64-unknown-linux-gnu": "@smoke_environments//:python_3.11.6_aarch64-unknown-linux-gnu.json",
-        ":_env_python_3.11.6_x86_64-apple-darwin": "@smoke_environments//:python_3.11.6_x86_64-apple-darwin.json",
         ":_env_python_3.11.6_x86_64-unknown-linux-gnu": "@smoke_environments//:python_3.11.6_x86_64-unknown-linux-gnu.json",
         ":_env_python_3.12.0_aarch64-apple-darwin": "@smoke_environments//:python_3.12.0_aarch64-apple-darwin.json",
         ":_env_python_3.12.0_aarch64-unknown-linux-gnu": "@smoke_environments//:python_3.12.0_aarch64-unknown-linux-gnu.json",
-        ":_env_python_3.12.0_x86_64-apple-darwin": "@smoke_environments//:python_3.12.0_x86_64-apple-darwin.json",
         ":_env_python_3.12.0_x86_64-unknown-linux-gnu": "@smoke_environments//:python_3.12.0_x86_64-unknown-linux-gnu.json",
     })
 
@@ -193,32 +175,22 @@ def targets():
         ":[email protected]",
         ":[email protected]",
     ] + select({
-        ":_env_python_3.10.12_aarch64-apple-darwin": [
+        ":_env_python_3.10.11_aarch64-apple-darwin": [
             ":[email protected]",
             ":[email protected]",
         ],
-        ":_env_python_3.10.12_aarch64-unknown-linux-gnu": [
-            ":[email protected]",
-        ],
-        ":_env_python_3.10.12_x86_64-apple-darwin": [
-            ":[email protected]",
+        ":_env_python_3.10.11_aarch64-unknown-linux-gnu": [
             ":[email protected]",
         ],
-        ":_env_python_3.10.12_x86_64-unknown-linux-gnu": [
+        ":_env_python_3.10.11_x86_64-unknown-linux-gnu": [
             ":[email protected]",
         ],
         ":_env_python_3.11.6_aarch64-apple-darwin": [
             ":[email protected]",
         ],
-        ":_env_python_3.11.6_x86_64-apple-darwin": [
-            ":[email protected]",
-        ],
         ":_env_python_3.12.0_aarch64-apple-darwin": [
             ":[email protected]",
         ],
-        ":_env_python_3.12.0_x86_64-apple-darwin": [
-            ":[email protected]",
-        ],
         "//conditions:default": [],
     })
 

diff --git a/e2e/workspace/poetry/lock.bzl b/e2e/workspace/poetry/lock.bzl
@@ -41,23 +41,18 @@ def targets():
         )
 
     native.alias(
-        name = "_env_python_3.10.12_aarch64-apple-darwin",
-        actual = "@smoke_environments//:python_3.10.12_aarch64-apple-darwin_config",
+        name = "_env_python_3.10.11_aarch64-apple-darwin",
+        actual = "@smoke_environments//:python_3.10.11_aarch64-apple-darwin_config",
     )
 
     native.alias(
-        name = "_env_python_3.10.12_aarch64-unknown-linux-gnu",
-        actual = "@smoke_environments//:python_3.10.12_aarch64-unknown-linux-gnu_config",
+        name = "_env_python_3.10.11_aarch64-unknown-linux-gnu",
+        actual = "@smoke_environments//:python_3.10.11_aarch64-unknown-linux-gnu_config",
     )
 
     native.alias(
-        name = "_env_python_3.10.12_x86_64-apple-darwin",
-        actual = "@smoke_environments//:python_3.10.12_x86_64-apple-darwin_config",
-    )
-
-    native.alias(
-        name = "_env_python_3.10.12_x86_64-unknown-linux-gnu",
-        actual = "@smoke_environments//:python_3.10.12_x86_64-unknown-linux-gnu_config",
+        name = "_env_python_3.10.11_x86_64-unknown-linux-gnu",
+        actual = "@smoke_environments//:python_3.10.11_x86_64-unknown-linux-gnu_config",
     )
 
     native.alias(
@@ -70,11 +65,6 @@ def targets():
         actual = "@smoke_environments//:python_3.11.6_aarch64-unknown-linux-gnu_config",
     )
 
-    native.alias(
-        name = "_env_python_3.11.6_x86_64-apple-darwin",
-        actual = "@smoke_environments//:python_3.11.6_x86_64-apple-darwin_config",
-    )
-
     native.alias(
         name = "_env_python_3.11.6_x86_64-unknown-linux-gnu",
         actual = "@smoke_environments//:python_3.11.6_x86_64-unknown-linux-gnu_config",
@@ -90,29 +80,21 @@ def targets():
         actual = "@smoke_environments//:python_3.12.0_aarch64-unknown-linux-gnu_config",
     )
 
-    native.alias(
-        name = "_env_python_3.12.0_x86_64-apple-darwin",
-        actual = "@smoke_environments//:python_3.12.0_x86_64-apple-darwin_config",
-    )
-
     native.alias(
         name = "_env_python_3.12.0_x86_64-unknown-linux-gnu",
         actual = "@smoke_environments//:python_3.12.0_x86_64-unknown-linux-gnu_config",
     )
 
     # buildifier: disable=unused-variable
     _target = select({
-        ":_env_python_3.10.12_aarch64-apple-darwin": "@smoke_environments//:python_3.10.12_aarch64-apple-darwin.json",
-        ":_env_python_3.10.12_aarch64-unknown-linux-gnu": "@smoke_environments//:python_3.10.12_aarch64-unknown-linux-gnu.json",
-        ":_env_python_3.10.12_x86_64-apple-darwin": "@smoke_environments//:python_3.10.12_x86_64-apple-darwin.json",
-        ":_env_python_3.10.12_x86_64-unknown-linux-gnu": "@smoke_environments//:python_3.10.12_x86_64-unknown-linux-gnu.json",
+        ":_env_python_3.10.11_aarch64-apple-darwin": "@smoke_environments//:python_3.10.11_aarch64-apple-darwin.json",
+        ":_env_python_3.10.11_aarch64-unknown-linux-gnu": "@smoke_environments//:python_3.10.11_aarch64-unknown-linux-gnu.json",
+        ":_env_python_3.10.11_x86_64-unknown-linux-gnu": "@smoke_environments//:python_3.10.11_x86_64-unknown-linux-gnu.json",
         ":_env_python_3.11.6_aarch64-apple-darwin": "@smoke_environments//:python_3.11.6_aarch64-apple-darwin.json",
         ":_env_python_3.11.6_aarch64-unknown-linux-gnu": "@smoke_environments//:python_3.11.6_aarch64-unknown-linux-gnu.json",
-        ":_env_python_3.11.6_x86_64-apple-darwin": "@smoke_environments//:python_3.11.6_x86_64-apple-darwin.json",
         ":_env_python_3.11.6_x86_64-unknown-linux-gnu": "@smoke_environments//:python_3.11.6_x86_64-unknown-linux-gnu.json",
         ":_env_python_3.12.0_aarch64-apple-darwin": "@smoke_environments//:python_3.12.0_aarch64-apple-darwin.json",
         ":_env_python_3.12.0_aarch64-unknown-linux-gnu": "@smoke_environments//:python_3.12.0_aarch64-unknown-linux-gnu.json",
-        ":_env_python_3.12.0_x86_64-apple-darwin": "@smoke_environments//:python_3.12.0_x86_64-apple-darwin.json",
         ":_env_python_3.12.0_x86_64-unknown-linux-gnu": "@smoke_environments//:python_3.12.0_x86_64-unknown-linux-gnu.json",
     })
 
@@ -181,32 +163,22 @@ def targets():
         ":[email protected]",
         ":[email protected]",
     ] + select({
-        ":_env_python_3.10.12_aarch64-apple-darwin": [
+        ":_env_python_3.10.11_aarch64-apple-darwin": [
             ":[email protected]",
             ":[email protected]",
         ],
-        ":_env_python_3.10.12_aarch64-unknown-linux-gnu": [
-            ":[email protected]",
-        ],
-        ":_env_python_3.10.12_x86_64-apple-darwin": [
-            ":[email protected]",
+        ":_env_python_3.10.11_aarch64-unknown-linux-gnu": [
             ":[email protected]",
         ],
-        ":_env_python_3.10.12_x86_64-unknown-linux-gnu": [
+        ":_env_python_3.10.11_x86_64-unknown-linux-gnu": [
             ":[email protected]",
         ],
         ":_env_python_3.11.6_aarch64-apple-darwin": [
             ":[email protected]",
         ],
-        ":_env_python_3.11.6_x86_64-apple-darwin": [
-            ":[email protected]",
-        ],
         ":_env_python_3.12.0_aarch64-apple-darwin": [
             ":[email protected]",
         ],
-        ":_env_python_3.12.0_x86_64-apple-darwin": [
-            ":[email protected]",
-        ],
         "//conditions:default": [],
     })