diff --git a/.github/workflows/ci-ifcopenshell-conda-daily.yml b/.github/workflows/ci-ifcopenshell-conda-daily.yml index 57e6ab6ab4..8f16789318 100644 --- a/.github/workflows/ci-ifcopenshell-conda-daily.yml +++ b/.github/workflows/ci-ifcopenshell-conda-daily.yml @@ -54,7 +54,8 @@ jobs: platform: [ { name: win, distver: windows-latest, pkg_dir: 'win-64' }, { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' }, - { name: macOS, distver: macos-latest, pkg_dir: 'osx-64' } + { name: macOS-arm, distver: macos-latest, pkg_dir: 'osx-arm64' } + { name: macOS-x86, distver: macos-13, pkg_dir: 'osx-64' } ] steps: - name: Set up swap space @@ -68,7 +69,7 @@ jobs: submodules: recursive - name: Download and extract MacOSX SDK - if: ${{ runner.os == 'macOS' }} + if: ${{ matrix.platform.name == 'macOS-x86' }} run: | curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/ diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index 1f60daec48..83e1c4c03c 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -20,8 +20,9 @@ cxx_compiler_version: - '12' # [linux] - '16' # [osx] c_stdlib_version: -- '2.12' # [linux] -- '10.13' # [osx] + - 2.17 # [linux] + - 10.13 # [osx and x86_64] + - 11.0 # [osx and arm64] hdf5: - 1.14.6 libboost_devel: @@ -43,12 +44,12 @@ target_platform: - win-64 # [win] - linux-64 # [linux] - osx-64 # [osx] -macos_machine: -- x86_64-apple-darwin13.4.0 -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' +macos_machine: # [osx] + - x86_64-apple-darwin13.4.0 # [osx and x86_64] + - arm64-apple-darwin20.0.0 # [osx and arm64] +MACOSX_DEPLOYMENT_TARGET: # [osx] + - 11.0 # [osx and arm64] + - 10.13 # [osx and x86_64] -CONDA_BUILD_SYSROOT: - - "/Users/runner/work/MacOSX10.13.sdk" # [osx] \ No newline at end of file +CONDA_BUILD_SYSROOT: # [osx] + - "/Users/runner/work/MacOSX10.13.sdk" # [osx and x86_64] \ No newline at end of file