From cfcee35d661e31bde7459c688ac893aa35f268d2 Mon Sep 17 00:00:00 2001 From: PhilipDeegan Date: Tue, 13 Aug 2024 23:09:46 +0200 Subject: [PATCH] try mac arm --- .github/workflows/build_nix.yml | 2 +- .github/workflows/build_osx.yml | 18 ++++++++++++++---- lib/mkn.yaml | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml index 778632494..37e789251 100644 --- a/.github/workflows/build_nix.yml +++ b/.github/workflows/build_nix.yml @@ -27,7 +27,7 @@ jobs: fail-fast: false max-parallel: 4 matrix: - python-version: ['3.9', '3.10', '3.11'] # , '3.12' not ready + python-version: ['3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml index ee234af97..e0951f6a7 100644 --- a/.github/workflows/build_osx.yml +++ b/.github/workflows/build_osx.yml @@ -20,16 +20,17 @@ env: jobs: build: name: Python ${{ matrix.python-version }} - runs-on: macos-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false max-parallel: 4 matrix: + os: [ macos-12, macos-13, macos-latest] python-version: ['3.11', '3.12'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true @@ -49,9 +50,18 @@ jobs: python3 -m pip install wheel pip --upgrade python3 -m pip install -r requirements.txt - - name: build + - name: build_arm + if: runner.os == 'macos-latest' run: | - curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx + curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_arm_osx + chmod +x mkn + ./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17" + + + - name: build_x86 + if: runner.os != 'macos-latest' + run: | + curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_x86_osx chmod +x mkn ./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17" diff --git a/lib/mkn.yaml b/lib/mkn.yaml index ff610f655..7b5f8c663 100644 --- a/lib/mkn.yaml +++ b/lib/mkn.yaml @@ -36,7 +36,7 @@ profile: bsd_lib: ${bsd_largs} win: -LTCG mod: | - lang.python3{compile{with: numpy}, link{delete: CoreFoundation }} + lang.python3{compile:{with: numpy}, link:{delete: CoreFoundation }} - name: tick.py parent: arg