Skip to content

Commit 6738581

Browse files
beckermrbeckermr
authored
Merge pull request #51 from conda-forge-admin/conda_forge_admin_50
feat: support osx-arm64
2 parents df64722 + 2591746 commit 6738581

17 files changed

Lines changed: 255 additions & 88 deletions

‎.azure-pipelines/azure-pipelines-linux.yml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.azure-pipelines/azure-pipelines-osx.yml‎

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.ci_support/osx_64_threadingopenmp.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
MACOSX_DEPLOYMENT_TARGET:
2-
- '10.13'
2+
- '11.0'
33
MACOSX_SDK_VERSION:
4-
- '10.13'
4+
- '11.0'
55
c_compiler:
66
- clang
77
c_compiler_version:
88
- '19'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
12-
- '10.13'
12+
- '11.0'
1313
channel_sources:
1414
- conda-forge
1515
channel_targets:

‎.ci_support/osx_64_threadingpthreads.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
MACOSX_DEPLOYMENT_TARGET:
2-
- '10.13'
2+
- '11.0'
33
MACOSX_SDK_VERSION:
4-
- '10.13'
4+
- '11.0'
55
c_compiler:
66
- clang
77
c_compiler_version:
88
- '19'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
12-
- '10.13'
12+
- '11.0'
1313
channel_sources:
1414
- conda-forge
1515
channel_targets:

‎.ci_support/osx_arm64_threadingopenmp.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
MACOSX_DEPLOYMENT_TARGET:
2+
- '11.0'
3+
MACOSX_SDK_VERSION:
4+
- '11.0'
5+
c_compiler:
6+
- clang
7+
c_compiler_version:
8+
- '19'
9+
c_stdlib:
10+
- macosx_deployment_target
11+
c_stdlib_version:
12+
- '11.0'
13+
channel_sources:
14+
- conda-forge
15+
channel_targets:
16+
- conda-forge main
17+
llvm_openmp:
18+
- '19'
19+
macos_machine:
20+
- arm64-apple-darwin20.0.0
21+
perl:
22+
- 5.32.1
23+
target_platform:
24+
- osx-arm64
25+
threading:
26+
- openmp

‎.ci_support/osx_arm64_threadingpthreads.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
MACOSX_DEPLOYMENT_TARGET:
2+
- '11.0'
3+
MACOSX_SDK_VERSION:
4+
- '11.0'
5+
c_compiler:
6+
- clang
7+
c_compiler_version:
8+
- '19'
9+
c_stdlib:
10+
- macosx_deployment_target
11+
c_stdlib_version:
12+
- '11.0'
13+
channel_sources:
14+
- conda-forge
15+
channel_targets:
16+
- conda-forge main
17+
llvm_openmp:
18+
- '19'
19+
macos_machine:
20+
- arm64-apple-darwin20.0.0
21+
perl:
22+
- 5.32.1
23+
target_platform:
24+
- osx-arm64
25+
threading:
26+
- pthreads

‎.github/workflows/conda-build.yml‎

Lines changed: 117 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,125 @@
1-
# This file was added automatically by admin-migrations. Do not modify.
2-
# It ensures that Github Actions can run once rerendered for the first time.
1+
# This file was generated automatically from conda-smithy. To update this configuration,
2+
# update the conda-forge.yml and/or the recipe/meta.yaml.
33
# -*- mode: yaml -*-
44

55
name: Build conda package
66
on:
7-
workflow_dispatch:
7+
push:
8+
9+
pull_request:
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
13+
cancel-in-progress: true
814

915
jobs:
1016
build:
11-
name: Disabled build
12-
runs-on: ubuntu-slim
13-
if: false
17+
name: ${{ matrix.CONFIG }}
18+
runs-on: ${{ matrix.runs_on }}
19+
timeout-minutes: 360
20+
strategy:
21+
fail-fast: false
22+
max-parallel: 50
23+
matrix:
24+
include:
25+
- CONFIG: linux_64_threadingopenmp
26+
UPLOAD_PACKAGES: True
27+
os: ubuntu
28+
runs_on: ['ubuntu-latest']
29+
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
30+
- CONFIG: linux_64_threadingpthreads
31+
UPLOAD_PACKAGES: True
32+
os: ubuntu
33+
runs_on: ['ubuntu-latest']
34+
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
35+
- CONFIG: linux_aarch64_threadingopenmp
36+
UPLOAD_PACKAGES: True
37+
os: ubuntu
38+
runs_on: ['ubuntu-latest']
39+
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
40+
- CONFIG: linux_aarch64_threadingpthreads
41+
UPLOAD_PACKAGES: True
42+
os: ubuntu
43+
runs_on: ['ubuntu-latest']
44+
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
1445
steps:
15-
- run: exit 0
46+
47+
- name: Checkout code
48+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
50+
- name: Build on Linux
51+
id: build-linux
52+
if: matrix.os == 'ubuntu'
53+
env:
54+
CONFIG: ${{ matrix.CONFIG }}
55+
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
56+
DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
57+
CI: github_actions
58+
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
59+
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
60+
FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
61+
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
62+
shell: bash
63+
run: |
64+
if [[ "$(uname -m)" == "x86_64" ]]; then
65+
echo "::group::Configure binfmt_misc"
66+
docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
67+
fi
68+
export flow_run_id="github_$GITHUB_RUN_ID"
69+
export remote_url="https://github.com/$GITHUB_REPOSITORY"
70+
export sha="$GITHUB_SHA"
71+
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
72+
export GIT_BRANCH="$(basename $GITHUB_REF)"
73+
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
74+
export IS_PR_BUILD="True"
75+
else
76+
export IS_PR_BUILD="False"
77+
fi
78+
echo "::endgroup::"
79+
./.scripts/run_docker_build.sh
80+
81+
- name: Build on macOS
82+
id: build-macos
83+
if: matrix.os == 'macos'
84+
env:
85+
CONFIG: ${{ matrix.CONFIG }}
86+
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
87+
CI: github_actions
88+
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
89+
FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
90+
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
91+
shell: bash
92+
run: |
93+
export flow_run_id="github_$GITHUB_RUN_ID"
94+
export remote_url="https://github.com/$GITHUB_REPOSITORY"
95+
export sha="$GITHUB_SHA"
96+
export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
97+
export GIT_BRANCH="$(basename $GITHUB_REF)"
98+
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
99+
export IS_PR_BUILD="True"
100+
else
101+
export IS_PR_BUILD="False"
102+
fi
103+
./.scripts/run_osx_build.sh
104+
105+
- name: Build on windows
106+
id: build-windows
107+
if: matrix.os == 'windows'
108+
shell: cmd
109+
run: |
110+
set "flow_run_id=github_%GITHUB_RUN_ID%"
111+
set "remote_url=https://github.com/%GITHUB_REPOSITORY%"
112+
set "sha=%GITHUB_SHA%"
113+
call ".scripts\run_win_build.bat"
114+
env:
115+
# default value; make it explicit, as it needs to match with artefact
116+
# generation below. Not configurable for now, can be revisited later
117+
CONDA_BLD_DIR: C:\bld
118+
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
119+
PYTHONUNBUFFERED: 1
120+
CONFIG: ${{ matrix.CONFIG }}
121+
CI: github_actions
122+
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
123+
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
124+
FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
125+
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}

‎.scripts/build_steps.sh‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.scripts/run_docker_build.sh‎

Lines changed: 27 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
⚡