Skip to content

Commit

Permalink
test(e2e): switch to macos15 runner
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Villanueva <[email protected]>
  • Loading branch information
danivilla9 committed Jan 14, 2025
1 parent 8a09608 commit 01a9d55
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions .github/workflows/pr-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2022, ubuntu-24.04, macos-14]
os: [windows-2022, ubuntu-24.04, macos-15]
runs-on: ${{ matrix.os }}
env:
SKIP_INSTALLATION: true
Expand Down Expand Up @@ -168,18 +168,14 @@ jobs:
working-directory: ./sso-extension
run: pnpm install

# - name: Install jq (macOS)
# if: matrix.os == 'macos-14'
# run: brew install jq

- name: Install vfkit
if: matrix.os == 'macos-14'
if: matrix.os == 'macos-15'
run: |
brew install cfergeau/crc/vfkit
vfkit --version
- name: Install Podman on macOS
if: matrix.os == 'macos-14'
if: matrix.os == 'macos-15'
run: |
ARCH=$(uname -m)
# echo "LATEST_RELEASE => ${LATEST_RELEASE}"
Expand All @@ -199,12 +195,12 @@ jobs:
echo "PATH=/opt/podman/bin:$PATH" >> $GITHUB_ENV
- name: Setup Podman machine on macOS
if: matrix.os == 'macos-14'
if: matrix.os == 'macos-15'
run: |
echo "START PODMAN MACHINE=>"
podman --version
# yes | podman machine reset
podman machine init
podman machine init --rootless
podman machine list
podman machine info
podman machine inspect
Expand All @@ -215,7 +211,7 @@ jobs:
run: pnpm test:e2e:build

- name: Ensure getting current HEAD version of the test framework (Ubuntu/MacOS)
if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-14'
if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-15'
working-directory: ./crc-extension
run: |
# workaround for https://github.com/containers/podman-desktop-extension-bootc/issues/712
Expand Down Expand Up @@ -259,7 +255,7 @@ jobs:
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
- name: Build OpenShift Local extension from container file and SSO dependency (Ubuntu/MacOS, podman)
if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-14'
if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-15'
working-directory: ./crc-extension
run: |
# build crc extension
Expand Down

0 comments on commit 01a9d55

Please sign in to comment.