From a5f259ecc3bf1b1c586cee6fdc38dd0aa09351c6 Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Mon, 25 Mar 2024 14:59:44 -0700 Subject: [PATCH 1/2] Reformat yml --- .github/workflows/python-package.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 8eeac91c..9f625fb2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -63,7 +63,6 @@ jobs: path: dist/tcod-*.tar.gz retention-days: 7 - # This makes sure that the latest versions of the SDL headers parse correctly. parse_sdl: needs: [ruff, mypy] @@ -290,15 +289,15 @@ jobs: retention-days: 7 publish: - needs: [sdist, build, build-macos, linux-wheels] - runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') - environment: - name: release - url: https://pypi.org/p/tcod - permissions: - id-token: write - steps: + needs: [sdist, build, build-macos, linux-wheels] + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/') + environment: + name: release + url: https://pypi.org/p/tcod + permissions: + id-token: write + steps: - uses: actions/download-artifact@v3 with: name: sdist From 123496b7152f1102c275af0bfe33a6b44e17c844 Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Mon, 25 Mar 2024 15:00:38 -0700 Subject: [PATCH 2/2] Set correct version on MacOS wheels --- .github/workflows/python-package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9f625fb2..844f451a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -273,7 +273,7 @@ jobs: # Downloads SDL2 for the later step. run: python3 build_sdl.py - name: Build wheels - uses: pypa/cibuildwheel@v2.12.3 + uses: pypa/cibuildwheel@v2.17.0 env: CIBW_BUILD: ${{ matrix.python }} CIBW_ARCHS_MACOS: x86_64 arm64 universal2 @@ -281,6 +281,7 @@ jobs: CIBW_BEFORE_TEST: pip install numpy CIBW_TEST_COMMAND: python -c "import tcod.context" CIBW_TEST_SKIP: "pp* *-macosx_arm64 *-macosx_universal2:arm64" + MACOSX_DEPLOYMENT_TARGET: "10.11" - name: Archive wheel uses: actions/upload-artifact@v3 with: