diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 53716759..f3aa450d 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, macos-14] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 51a0935d..32a2f2b4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, macos-14] steps: - uses: actions/checkout@v4 - name: make build diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index b8b1c9f3..23fe7bc9 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: node-version: [20.x, 22.x, latest] - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, macos-14] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 7ace094d..7e32d0a0 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -38,7 +38,7 @@ jobs: test-pypi: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, macos-14, windows-latest] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index a422454b..c9589477 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -7,7 +7,7 @@ jobs: release-pypi: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, macos-14, windows-latest] runs-on: ${{ matrix.os }} steps: diff --git a/release-pypi-linux.sh b/release-pypi-linux.sh index d5391dbf..20714a53 100644 --- a/release-pypi-linux.sh +++ b/release-pypi-linux.sh @@ -25,6 +25,10 @@ bash ${MINICONDA_FILENAME} -b -f -p $HOME/miniconda3 export PATH=$HOME/miniconda3/bin:$PATH eval "$(conda shell.bash hook)" +# Accept conda Terms of Service for required channels +conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main +conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r + for VERSION in 3.8 3.9 3.10 3.11 3.12; do # Create and activate environment conda config --add channels conda-forge diff --git a/release-pypi-macos.sh b/release-pypi-macos.sh index 909bea7c..b4a7fa1c 100644 --- a/release-pypi-macos.sh +++ b/release-pypi-macos.sh @@ -5,13 +5,24 @@ set -e # this script has to be ran from a clean dockerfile # Download and init conda -MINICONDA_FILENAME=Miniconda3-latest-MacOSX-x86_64.sh +# Detect architecture and set appropriate Miniconda filename +ARCH=$(uname -m) +if [ "$ARCH" = "arm64" ]; then + MINICONDA_FILENAME=Miniconda3-latest-MacOSX-arm64.sh +else + MINICONDA_FILENAME=Miniconda3-latest-MacOSX-x86_64.sh +fi + curl -L -o $MINICONDA_FILENAME \ "https://repo.continuum.io/miniconda/$MINICONDA_FILENAME" bash ${MINICONDA_FILENAME} -b -f -p $HOME/miniconda3 export PATH=$HOME/miniconda3/bin:$PATH eval "$(conda shell.bash hook)" +# Accept conda Terms of Service for required channels +conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main +conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r + for VERSION in 3.8 3.9 3.10 3.11 3.12; do # Create and activate environment conda config --add channels conda-forge diff --git a/release-pypi-windows.cmd b/release-pypi-windows.cmd index 7056d9d5..635399f3 100644 --- a/release-pypi-windows.cmd +++ b/release-pypi-windows.cmd @@ -4,6 +4,10 @@ setlocal EnableDelayedExpansion SET VERSIONS=3.8 3.9 3.10 3.11 3.12 SET SOURCEDIR=%cd% +REM Accept conda Terms of Service for required channels +CALL C:\Miniconda/condabin/conda.bat tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main +CALL C:\Miniconda/condabin/conda.bat tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r + REM Build packages for %%v in (%VERSIONS%) do ( SET ENV_NAME=py%%v