Skip to content

github actions: try macos15-intel #21677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

github actions: try macos15-intel #21677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b183256
github actions: try maco15-intel
medyagh Oct 1, 2025
b725c31
trigger tests edit go code
medyagh Oct 2, 2025
6f7e28f
install qemu on macos 15
medyagh Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/functional_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ jobs:
cruntime: docker
os: ubuntu-22.04
test-timeout: 7m
- name: qemu-docker-macos-13-x86_64
- name: qemu-docker-macos-15-x86_64
driver: qemu
cruntime: docker
os: macos-13
os: macos-15-intel
extra-start-args: --network socket_vmnet
test-timeout: 50m
- name: vfkit-docker-macos-13-x86_64
- name: vfkit-docker-macos-15-x86_64
driver: vfkit
cruntime: docker
os: macos-13
os: macos-13-intel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

macos-15-intel

extra-start-args: --network vmnet-shared
test-timeout: 50m
steps:
Expand Down Expand Up @@ -258,8 +258,8 @@ jobs:
curl https://get.docker.com | sudo sh
dockerd-rootless-setuptool.sh install -f
docker context use rootless
- name: Ensure bootpd is enabled (macos-13)
if: matrix.os == 'macos-13'
- name: Ensure bootpd is enabled (macos)
if: contains(matrix.os, 'macos')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed on macos-15, time to remove this hack.

See nirs/vmnet-helper#107

shell: bash
run: |
set -x
Expand All @@ -268,7 +268,7 @@ jobs:
sudo $fw --add /usr/libexec/bootpd
sudo $fw --unblock /usr/libexec/bootpd
- name: Update brew package index (macos)
if: runner.os == 'macOS'
if: contains(matrix.os, 'macos')
run: brew update
- name: Update apt-get package index (ubuntu)
if: runner.os == 'Linux' && (matrix.driver == 'podman' || matrix.driver == 'none')
Expand Down Expand Up @@ -369,12 +369,12 @@ jobs:
fi
kubectl version --client=true
- name: Install qemu and socket_vmnet (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'qemu'
if: contains(matrix.os, 'macos') && matrix.driver == 'qemu'
run: |
brew install qemu socket_vmnet
HOMEBREW=$(which brew) && sudo ${HOMEBREW} services start socket_vmnet
- name: Install vfkit and vmnet_helper (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'vfkit'
if: contains(matrix.os, 'macos') && matrix.driver == 'vfkit'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can simplify to check only for vfkit since it is not available on !macOS

run: |
brew install vfkit
curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/smoke-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
matrix:
include:
- driver: qemu
os: macos-13
os: macos-15-intel
network_flag: --network socket_vmnet
- driver: vfkit
os: macos-13
os: macos-15-intel
network_flag: --network vmnet-shared
- driver: docker
os: ubuntu-24.04
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- name: Build Binaries
run: make
- name: Ensure bootpd is enabled (macos)
if: matrix.os == 'macos-13'
if: matrix.os == 'macos-15-intel'
shell: bash
run: |
set -x
Expand All @@ -103,18 +103,18 @@ jobs:
sudo $fw --add /usr/libexec/bootpd
sudo $fw --unblock /usr/libexec/bootpd
- name: Update brew (macos)
if: matrix.os == 'macos-13'
if: contains(matrix.os, 'macos')
run: brew update
- name: Install tools (macos)
if: matrix.os == 'macos-13'
if: contains(matrix.os, 'macos')
run: brew install tree
- name: Install vfkit and vmnet-helper (macos)
if: matrix.driver == 'vfkit'
if: contains(matrix.os, 'macos')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Incorect change - keep the previous code.

run: |
brew install vfkit
curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash
- name: Install qemu and socket_vmnet (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'qemu'
if: contains(matrix.os, 'macos') && matrix.driver == 'qemu'
run: |
brew install qemu socket_vmnet
HOMEBREW=$(which brew) && sudo ${HOMEBREW} services start socket_vmnet
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/bootstrapper/certs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"strings"
"time"

// WARNING: use path for kic/iso and path/filepath for user os
// WARNING: use path for kic/iso and path/filepath for user os paths
"path"
"path/filepath"

Expand Down
Loading