From 159ab5238c2ab4f383d0b7cd5232561a9b0a66be Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Tue, 2 Apr 2024 18:53:39 +0200 Subject: [PATCH] build fixes --- .github/workflows/publish.yml | 18 ++++++++++++------ meta.yaml | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 168d92dc0..48dae7cab 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,16 +8,20 @@ jobs: matrix: include: - os: ubuntu-latest - target-platform: linux-64 + target-platform: linux-x86_64 - os: ubuntu-latest target-platform: linux-aarch64 - os: windows-latest target-platform: win-64 - - os: macos-latest - target-platform: osx-64 - - os: macos-latest + - os: macos-latest-large + target-platform: osx-intel + - os: macos-latest-xlarge target-platform: osx-arm64 runs-on: ${{ matrix.os }} + defaults: + run: + # Required for conda-incubator/setup-miniconda@v3 + shell: bash -el {0} steps: - uses: actions/checkout@v3 with: @@ -25,10 +29,11 @@ jobs: - name: Get conda uses: conda-incubator/setup-miniconda@v3 with: - python-version: 3.9 + python-version: 3.12 channels: conda-forge + miniconda-version: latest - name: Prepare - run: conda install anaconda-client conda-build conda-verify + run: conda install anaconda-client conda-build=24.1.2 conda-verify py-lief=0.12.3 - name: Build and Upload env: ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }} @@ -37,6 +42,7 @@ jobs: if [ "${{ matrix.target-platform }}" == "osx-arm64" ]; then conda build --user microsoft . -m conda_build_config.yaml -m conda_build_config_osx_arm64.yaml elif [ "${{ matrix.target-platform }}" == "linux-aarch64" ]; then + conda install cross-python_linux-aarch64 conda build --user microsoft . -m conda_build_config.yaml -m conda_build_config_linux_aarch64.yaml else conda build --user microsoft . -m conda_build_config.yaml diff --git a/meta.yaml b/meta.yaml index 49e2260b0..55db08c7a 100644 --- a/meta.yaml +++ b/meta.yaml @@ -30,7 +30,7 @@ requirements: - greenlet ==3.0.1 - pyee ==11.0.1 - typing_extensions # [py<39] -test: +test: # [build_platform == target_platform] requires: - pip imports: