Skip to content

Commit

Permalink
macos12 to macos14
Browse files Browse the repository at this point in the history
  • Loading branch information
pranavcracker committed Dec 5, 2024
1 parent 85ebf32 commit e65df30
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
matrix:
target:
- {os: windows-2022, arch: 'win64'}
- {os: macos-12, arch: 'macos12-x86_64'}
- {os: macos-12, arch: 'macos12-arm64'}
- {os: macos-14, arch: 'macos14-x86_64'}
- {os: macos-14, arch: 'macos14-arm64'}
- {os: ubuntu-latest, arch: 'linux-x86_64'}
include:
- executable_path: './dist/kubemarine'
Expand All @@ -47,9 +47,9 @@ jobs:
'python scripts/ci/build_binary.py'
- target: {os: windows-2022, arch: 'win64'}
build_cmd: python scripts/ci/build_binary.py
- target: {os: macos-12, arch: 'macos12-x86_64'}
- target: {os: macos-14, arch: 'macos14-x86_64'}
build_cmd: python scripts/ci/build_binary.py x86_64
- target: {os: macos-12, arch: 'macos12-arm64'}
- target: {os: macos-14, arch: 'macos14-arm64'}
build_cmd: python scripts/ci/build_binary.py arm64
steps:
- name: Checkout Repo
Expand All @@ -66,7 +66,7 @@ jobs:

# Remove the step after https://github.com/actions/setup-python/issues/713 is solved
- name: Fix broken pip installation
if: ${{ matrix.target.os == 'macos-12' }}
if: ${{ matrix.target.os == 'macos-14' }}
run: |
SITE_PACKAGES="/Library/Frameworks/Python.framework/Versions/3.11/lib/python3.11/site-packages"
PIP_VERSION=$(cat $SITE_PACKAGES/pip/__init__.py | grep __version__ | sed 's/["=]//g' | awk '{print $2}')
Expand All @@ -79,7 +79,7 @@ jobs:
- name: Build
run: ${{ matrix.build_cmd }}
- name: Run Selftest
if: ${{ matrix.target.arch != 'macos12-arm64' }}
if: ${{ matrix.target.arch != 'macos14-arm64' }}
run: ${{ matrix.executable_path }} selftest

- name: Upload Artifact
Expand All @@ -90,14 +90,14 @@ jobs:
retention-days: 1

test-binary:
# Currently macos-latest is macos-14-arm64, and thus binary build for macos12-arm64 can be tested on it.
# Currently macos-latest is macos-14-arm64, and thus binary build for macos14-arm64 can be tested on it.
runs-on: macos-latest
needs: build-binary
steps:
- name: Download Executable
uses: actions/download-artifact@v3
with:
name: kubemarine-macos12-arm64
name: kubemarine-macos14-arm64
- name: Run Selftest
run: |
chmod +x kubemarine
Expand Down Expand Up @@ -202,7 +202,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags')
strategy:
matrix:
arch: [ 'win64', 'macos12-x86_64', 'macos12-arm64', 'linux-x86_64' ]
arch: [ 'win64', 'macos14-x86_64', 'macos14-arm64', 'linux-x86_64' ]
include:
- ext: ''
- arch: 'win64'
Expand Down

0 comments on commit e65df30

Please sign in to comment.