Skip to content

Commit

Permalink
Update distro.yml (#62)
Browse files Browse the repository at this point in the history
  • Loading branch information
makslevental authored Dec 6, 2024
1 parent 17c570f commit b13f3c1
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/distro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,17 @@ jobs:
- OS: windows-2019
ARCH: AMD64

- OS: macos-12
- OS: macos-13
ARCH: x86_64

- OS: macos-12
- OS: macos-13
ARCH: arm64

# - OS: macos-12
# - OS: macos-13
# ARCH: arm64
# BUILD_VULKAN: true
#
# - OS: macos-12
# - OS: macos-13
# ARCH: arm64
# BUILD_OPENMP: true

Expand Down Expand Up @@ -404,7 +404,7 @@ jobs:
find $HOST_CCACHE_DIR -exec touch -a -m -t 197001010000 {} \;
- name: rename non-windows
if: ${{ matrix.OS == 'ubuntu-20.04' || matrix.OS == 'macos-12' }}
if: ${{ matrix.OS == 'ubuntu-20.04' || matrix.OS == 'macos-13' }}
working-directory: ${{ steps.setup_base.outputs.WORKSPACE_ROOT }}
run: |
Expand Down Expand Up @@ -440,7 +440,7 @@ jobs:
if [ x"${{ matrix.OS }}" == x"ubuntu-20.04" ]; then
PLAT="linux"
elif [ x"${{ matrix.OS }}" == x"macos-12" ]; then
elif [ x"${{ matrix.OS }}" == x"macos-13" ]; then
PLAT="macosx_12_0"
elif [ x"${{ matrix.OS }}" == x"windows-2019" ]; then
PLAT="win"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ jobs:
- OS: windows-2019
ARCH: AMD64

- OS: macos-12
- OS: macos-13
ARCH: x86_64

- OS: macos-12
- OS: macos-13
ARCH: arm64

# - OS: macos-12
# - OS: macos-13
# ARCH: arm64
# BUILD_VULKAN: true
#
# - OS: macos-12
# - OS: macos-13
# ARCH: arm64
# BUILD_OPENMP: true

Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
- OS: windows-2019
ARCH: AMD64

- OS: macos-12
- OS: macos-13
ARCH: x86_64

- OS: macos-14
Expand Down
6 changes: 3 additions & 3 deletions actions/setup_base/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ runs:
run: pip install cibuildwheel wheel

- name: install rename
if: ${{ inputs.MATRIX_OS == 'ubuntu-20.04' || inputs.MATRIX_OS == 'macos-12' }}
if: ${{ inputs.MATRIX_OS == 'ubuntu-20.04' || inputs.MATRIX_OS == 'macos-13' }}
shell: bash
run: |
if [ x"${{ inputs.MATRIX_OS }}" == x"macos-12" ]; then
if [ x"${{ inputs.MATRIX_OS }}" == x"macos-13" ]; then
brew install rename
else
sudo apt-get install -y rename
Expand All @@ -109,7 +109,7 @@ runs:
shell: pwsh

- run: echo "TEMP=/tmp" >> $GITHUB_ENV
if: ${{ inputs.MATRIX_OS == 'ubuntu-20.04' || inputs.MATRIX_OS == 'macos-12' }}
if: ${{ inputs.MATRIX_OS == 'ubuntu-20.04' || inputs.MATRIX_OS == 'macos-13' }}
shell: bash

- name: Set workspace root
Expand Down
2 changes: 1 addition & 1 deletion scripts/apply_patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [ x"$USE_CMAKE_NAMESPACES" == x"true" ]; then
PATCHES="$PATCHES namespaces"
fi

if [ x"$MATRIX_OS" == x"macos-12" ]; then
if [ x"$MATRIX_OS" == x"macos-13" ]; then
PATCHES="$PATCHES mac_vec"
fi

Expand Down
4 changes: 2 additions & 2 deletions scripts/build_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if [ "$machine" == "linux" ]; then
export ARCH=x86_64
export PARALLEL_LEVEL=15
elif [ "$machine" == "macos" ]; then
export MATRIX_OS=macos-12
export MATRIX_OS=macos-13
export CIBW_ARCHS=arm64
export CIBW_BUILD=cp311-macosx_arm64
export ARCH=arm64
Expand Down Expand Up @@ -67,7 +67,7 @@ done

if [ x"$MATRIX_OS" == x"ubuntu-20.04" ]; then
PLAT="manylinux_2_17"
elif [ x"$MATRIX_OS" == x"macos-12" ]; then
elif [ x"$MATRIX_OS" == x"macos-13" ]; then
PLAT="macosx_12_0"
elif [ x"$MATRIX_OS" == x"windows-2019" ]; then
PLAT="win"
Expand Down
2 changes: 1 addition & 1 deletion scripts/install_vulkan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -xe

if [[ x"$BUILD_VULKAN" == x"true" ]]; then
if [ x"$MATRIX_OS" == x"macos-12" ]; then
if [ x"$MATRIX_OS" == x"macos-13" ]; then
if [ ! -f vulkansdk-macos-1.3.239.0.dmg ]; then
wget -q https://sdk.lunarg.com/sdk/download/1.3.239.0/mac/vulkansdk-macos-1.3.239.0.dmg
sudo hdiutil attach vulkansdk-macos-1.3.239.0.dmg
Expand Down
2 changes: 1 addition & 1 deletion scripts/pip_install_mlir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ else
fi

if [ x"$CIBW_ARCHS" == x"arm64" ] || [ x"$CIBW_ARCHS" == x"aarch64" ]; then
if [ x"$MATRIX_OS" == x"macos-12" ] && [ x"$CIBW_ARCHS" == x"arm64" ]; then
if [ x"$MATRIX_OS" == x"macos-13" ] && [ x"$CIBW_ARCHS" == x"arm64" ]; then
PLAT=macosx_12_0_arm64
elif [ x"$MATRIX_OS" == x"ubuntu-20.04" ] && [ x"$CIBW_ARCHS" == x"aarch64" ]; then
PLAT=linux_aarch64
Expand Down

0 comments on commit b13f3c1

Please sign in to comment.