From ec294eaf55452f9cac649e4a2246c6a934c9c7cf Mon Sep 17 00:00:00 2001 From: PhilipDeegan Date: Wed, 14 Aug 2024 00:25:48 +0200 Subject: [PATCH] try mac arm --- .github/workflows/build_nix.yml | 2 +- .github/workflows/build_osx.yml | 23 ++++++++++++++++------- .github/workflows/build_win.yml | 2 +- .github/workflows/merge_master.yaml | 15 ++++++++------- .github/workflows/pythonpublish-osx.yml | 2 +- .github/workflows/pythonpublish-win.yml | 2 +- lib/mkn.yaml | 2 +- 7 files changed, 29 insertions(+), 19 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..c6f138698 100644 --- a/.github/workflows/build_osx.yml +++ b/.github/workflows/build_osx.yml @@ -20,38 +20,47 @@ env: jobs: build: name: Python ${{ matrix.python-version }} - runs-on: macos-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false - max-parallel: 4 + max-parallel: 6 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 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - architecture: x64 - name: info run: | python3 -V clang -v - swig -version + swig -version || ( brew update && brew install swig && swig -version ) - name: pip run: | python3 -m pip install wheel pip --upgrade python3 -m pip install -r requirements.txt - - name: build + - name: build_arm + if: matrix.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: matrix.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/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index d8b65b215..694e99fb8 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false max-parallel: 4 matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/merge_master.yaml b/.github/workflows/merge_master.yaml index dcadafac8..66ec44a7c 100644 --- a/.github/workflows/merge_master.yaml +++ b/.github/workflows/merge_master.yaml @@ -20,8 +20,8 @@ env: jobs: build_linux: - runs-on: ubuntu-latest - container: quay.io/pypa/manylinux2014_x86_64 + runs-on: ubuntu-20.04 + container: quay.io/pypa/manylinux_2_28_x86_64:latest strategy: fail-fast: false @@ -65,7 +65,7 @@ jobs: max-parallel: 4 matrix: os: [windows-latest] - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] runs-on: ${{ matrix.os }} @@ -86,7 +86,7 @@ jobs: git config --global --add safe.directory '*' python3 -V python3 -m pip install -U pip - python3 -m pip install -U build twine wheel + python3 -m pip install -U build twine wheel setuptools python3 -m pip install -U -r requirements.txt - name: build windows @@ -119,7 +119,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - uses: actions/setup-python@v4 @@ -134,12 +134,13 @@ jobs: python3 -m pip install -U pip python3 -m pip install -U build twine wheel python3 -m pip install -U -r requirements.txt + swig -version || ( brew update && brew install swig && swig -version ) - name: build macos env: MKN_PYTHON_LIB_EMBED: 1 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 PATH=$PWD:$PATH mkn -C lib build -g 0 -dtO 2 -a "-fPIC -std=c++17" @@ -188,7 +189,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest] - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] runs-on: ${{ matrix.os }} steps: - name: Setup Python diff --git a/.github/workflows/pythonpublish-osx.yml b/.github/workflows/pythonpublish-osx.yml index 0fe95ed3f..ea2ba5850 100644 --- a/.github/workflows/pythonpublish-osx.yml +++ b/.github/workflows/pythonpublish-osx.yml @@ -14,7 +14,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] name: Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/pythonpublish-win.yml b/.github/workflows/pythonpublish-win.yml index 285e5a8f1..17fc239e1 100644 --- a/.github/workflows/pythonpublish-win.yml +++ b/.github/workflows/pythonpublish-win.yml @@ -14,7 +14,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] name: Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v3 diff --git a/lib/mkn.yaml b/lib/mkn.yaml index ff610f655..41431504f 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 -framework }} - name: tick.py parent: arg