From 5bd78dfcaf32baf2e4926f20f06db6145a88baf2 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Wed, 18 Dec 2024 10:23:40 -0500 Subject: [PATCH] use specific macOS runners --- .github/workflows/build-wheels.yml | 10 +++++----- .github/workflows/release.yml | 2 +- CHANGELOG.md | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index b27d5e016..0fe9a743e 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -14,7 +14,7 @@ jobs: matrix: spec: - { name: 'linux x86_64', runner: ubuntu-20.04, target: manylinux_2_27_x86_64 } - - { name: 'macOS x86_64', runner: macos-12, target: macosx_10_14_x86_64 } + - { name: 'macOS x86_64', runner: macos-13, target: macosx_10_14_x86_64 } - { name: 'Windows x86_64', runner: windows-2019, target: win_amd64 } name: building ${{ matrix.spec.name }} runs-on: ${{ matrix.spec.runner }} @@ -68,12 +68,12 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: repository-url: https://test.pypi.org/legacy/ - packages_dir: dist - skip_existing: true + packages-dir: dist + skip-existing: true verbose: true - name: Publish wheels (PyPI) uses: pypa/gh-action-pypi-publish@release/v1 with: - packages_dir: dist - verbose: true \ No newline at end of file + packages-dir: dist + verbose: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ebd59340c..1537f517e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -227,7 +227,7 @@ jobs: build-darwin: if: github.repository_owner == 'openziti' || vars.ZROK_SKIP_MACOS_BUILD == 'false' - runs-on: macos-latest + runs-on: macos-14 steps: - name: import distribution cert uses: apple-actions/import-codesign-certs@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 30c30ff69..2933da2d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## v0.4.46 +FEATURE: Linux service template for systemd user units (https://github.com/openziti/zrok/pull/818) + FIX: Docker share examples had incorrect default path for zrok environment mountpoint FIX: Clarify how to use DNS providers like Route53 with the zrok Docker instance sample. @@ -12,7 +14,7 @@ CHANGE: Clarify OS requirements for zrok VPN CHANGE: Set the Windows executable search path in the Windows install guide. -FEATURE: Linux service template for systemd user units (https://github.com/openziti/zrok/pull/818) +CHANGE: bump macOS runner for Python module from macos-12 to macos-13 ## v0.4.45