From b1832560bcf41d5dae35ae460f555719430d49b1 Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Wed, 1 Oct 2025 12:26:48 -0700 Subject: [PATCH 1/3] github actions: try maco15-intel --- .github/workflows/functional_test.yml | 18 +++++++++--------- .github/workflows/smoke-test.yml | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/functional_test.yml b/.github/workflows/functional_test.yml index 19e3fba63635..cb75c1ecc148 100644 --- a/.github/workflows/functional_test.yml +++ b/.github/workflows/functional_test.yml @@ -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 extra-start-args: --network vmnet-shared test-timeout: 50m steps: @@ -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') shell: bash run: | set -x @@ -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') @@ -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' run: | brew install vfkit curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index 6b1f0df7b48c..65f048213e1e 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -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 @@ -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 @@ -103,13 +103,13 @@ 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') run: | brew install vfkit curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash From b725c3109c9d1153e606fc28caaa0680cba5fc08 Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Wed, 1 Oct 2025 22:21:49 -0700 Subject: [PATCH 2/3] trigger tests edit go code --- pkg/minikube/bootstrapper/certs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go index 3354f6bd8261..a6fd4b094e23 100644 --- a/pkg/minikube/bootstrapper/certs.go +++ b/pkg/minikube/bootstrapper/certs.go @@ -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" From 6f7e28ff4ebb4a784d06ab4d687ea59192c03c08 Mon Sep 17 00:00:00 2001 From: Medya Ghazizadeh Date: Wed, 1 Oct 2025 22:30:36 -0700 Subject: [PATCH 3/3] install qemu on macos 15 --- .github/workflows/smoke-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index 65f048213e1e..c698e999926a 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -114,7 +114,7 @@ jobs: 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