Skip to content

emulate x86_64 on latest GHA macos images #2380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
isuruf wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Draft

emulate x86_64 on latest GHA macos images #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda_smithy/configure_feedstock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,7 @@ def _github_actions_specific_setup(jinja_env, forge_config, forge_dir, platform)
runs_on = {
"osx-64": {
"os": "macos",
"hosted_labels": ("macos-13",),
"hosted_labels": ("macos-15",),
"self_hosted_labels": ("macOS", "x64"),
},
"osx-arm64": {
Expand Down
8 changes: 7 additions & 1 deletion conda_smithy/templates/github-actions.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all"
{%- endif %}
{%- endif %}
BUILD_PLATFORM: {{ data.build_platform }}
{%- endfor %}
steps:
{%- if github_actions.free_disk_space %}
Expand Down Expand Up @@ -144,6 +145,7 @@ jobs:
{%- if upload_on_branch %}
UPLOAD_ON_BRANCH: {{ upload_on_branch }}
{%- endif %}
BUILD_PLATFORM: {% raw %}${{ matrix.BUILD_PLATFORM }}{% endraw %}
{%- for secret in secrets %}
{{ secret }}: {% raw %}${{{% endraw %} secrets.{{ secret }} {% raw %}}}{% endraw %}
{%- endfor %}
Expand All @@ -159,7 +161,11 @@ jobs:
else
export IS_PR_BUILD="False"
fi
./.scripts/run_osx_build.sh
if [[ "${BUILD_PLATFORM:-}" == "osx-64" && "$(uname -m)" == "arm64" ]]; then
arch -x86_64 ./.scripts/run_osx_build.sh
else
./.scripts/run_osx_build.sh
fi

{%- for choco_pkg in choco %}
- name: "Install Chocolatey Package: {{ choco_pkg }}"
Expand Down