Skip to content

Commit e0d41d7

Browse files
authored
Merge pull request #974 from ferstar/ci/macos-14-support
ci: Add macOS 14 (ARM64) support and fix conda ToS issues in CI workflows
2 parents eb495cd + 4e55f83 commit e0d41d7

File tree

8 files changed

+25
-6
lines changed

8 files changed

+25
-6
lines changed

.github/workflows/bazel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, macos-latest]
14+
os: [ubuntu-latest, macos-latest, macos-14]
1515

1616
steps:
1717
- uses: actions/checkout@v4

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, macos-latest]
14+
os: [ubuntu-latest, macos-latest, macos-14]
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: make build

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
node-version: [20.x, 22.x, latest]
16-
os: [ubuntu-latest, macos-latest]
16+
os: [ubuntu-latest, macos-latest, macos-14]
1717

1818
steps:
1919
- uses: actions/checkout@v4

.github/workflows/python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
test-pypi:
3939
strategy:
4040
matrix:
41-
os: [ubuntu-latest, macos-latest, windows-latest]
41+
os: [ubuntu-latest, macos-latest, macos-14, windows-latest]
4242
runs-on: ${{ matrix.os }}
4343

4444
steps:

.github/workflows/release-pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
release-pypi:
88
strategy:
99
matrix:
10-
os: [ubuntu-latest, macos-latest, windows-latest]
10+
os: [ubuntu-latest, macos-latest, macos-14, windows-latest]
1111
runs-on: ${{ matrix.os }}
1212

1313
steps:

release-pypi-linux.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ bash ${MINICONDA_FILENAME} -b -f -p $HOME/miniconda3
2525
export PATH=$HOME/miniconda3/bin:$PATH
2626
eval "$(conda shell.bash hook)"
2727

28+
# Accept conda Terms of Service for required channels
29+
conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
30+
conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
31+
2832
for VERSION in 3.8 3.9 3.10 3.11 3.12; do
2933
# Create and activate environment
3034
conda config --add channels conda-forge

release-pypi-macos.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,24 @@ set -e
55
# this script has to be ran from a clean dockerfile
66

77
# Download and init conda
8-
MINICONDA_FILENAME=Miniconda3-latest-MacOSX-x86_64.sh
8+
# Detect architecture and set appropriate Miniconda filename
9+
ARCH=$(uname -m)
10+
if [ "$ARCH" = "arm64" ]; then
11+
MINICONDA_FILENAME=Miniconda3-latest-MacOSX-arm64.sh
12+
else
13+
MINICONDA_FILENAME=Miniconda3-latest-MacOSX-x86_64.sh
14+
fi
15+
916
curl -L -o $MINICONDA_FILENAME \
1017
"https://repo.continuum.io/miniconda/$MINICONDA_FILENAME"
1118
bash ${MINICONDA_FILENAME} -b -f -p $HOME/miniconda3
1219
export PATH=$HOME/miniconda3/bin:$PATH
1320
eval "$(conda shell.bash hook)"
1421

22+
# Accept conda Terms of Service for required channels
23+
conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
24+
conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
25+
1526
for VERSION in 3.8 3.9 3.10 3.11 3.12; do
1627
# Create and activate environment
1728
conda config --add channels conda-forge

release-pypi-windows.cmd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ setlocal EnableDelayedExpansion
44
SET VERSIONS=3.8 3.9 3.10 3.11 3.12
55
SET SOURCEDIR=%cd%
66

7+
REM Accept conda Terms of Service for required channels
8+
CALL C:\Miniconda/condabin/conda.bat tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
9+
CALL C:\Miniconda/condabin/conda.bat tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
10+
711
REM Build packages
812
for %%v in (%VERSIONS%) do (
913
SET ENV_NAME=py%%v

0 commit comments

Comments
 (0)