Skip to content
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

Jump to bottom

CI: try macos-14-large (Intel) #2637

Closed
wants to merge 2 commits into from
Closed

CI: try macos-14-large (Intel) #2637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
241cd3f
CI: try macos-14-large (Intel)
AkihiroSuda Sep 19, 2024
741f4b9
CI: upgrade test: bump up the old Lima (v0.15.1→v0.23.2)
AkihiroSuda Sep 19, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
artifacts-darwin:
name: Artifacts Darwin
runs-on: macos-12
runs-on: macos-12 # The oldest available version
timeout-minutes: 20
steps:
- name: "Show xcode and SDK version"
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
integration:
name: Integration tests
# on macOS 12, the default vmType is QEMU
runs-on: macos-12
runs-on: macos-12 # Do not upgrade until GitHub removes macos-12
timeout-minutes: 120
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -320,7 +320,7 @@ jobs:

vmnet:
name: "VMNet test"
runs-on: macos-12
runs-on: macos-14-large
timeout-minutes: 120
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -370,22 +370,23 @@ jobs:

upgrade:
name: "Upgrade test"
runs-on: macos-12
runs-on: macos-14-large
timeout-minutes: 120
strategy:
matrix:
oldver: ["v0.15.1"]
oldver: ["v0.23.2"]
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
go-version: 1.23.x
- name: Cache image used by ${{ matrix.oldver }}/examples/ubuntu-lts.yaml
- name: Cache image used by ${{ matrix.oldver }}/examples/default.yaml
uses: ./.github/actions/setup_cache_for_template
with:
template: https://raw.githubusercontent.com/lima-vm/lima/${{ matrix.oldver }}/examples/ubuntu-lts.yaml
# the template must not be a symlink: https://stackoverflow.com/a/60778918
template: https://raw.githubusercontent.com/lima-vm/lima/${{ matrix.oldver }}/examples/default.yaml
- name: Install test dependencies
run: brew install qemu bash coreutils
- name: Test
Expand All @@ -394,14 +395,14 @@ jobs:
timeout_minutes: 30
retry_on: error
max_attempts: 3
command: ./hack/test-upgrade.sh ${{ matrix.oldver }} ${{ github.sha }}
command: ./hack/test-upgrade.sh ${{ matrix.oldver }} ${{ github.sha }} template://default
- if: always()
uses: ./.github/actions/upload_failure_logs_if_exists

vz:
name: "vz"
# on macOS 13, the default vmType is VZ
runs-on: macos-13
# on macOS >= 13, the default vmType is VZ
runs-on: macos-14-large
Copy link
Contributor

@nirs nirs Sep 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This is intel because you configured the repo with an intel runner?

OK, found the docs, it is very surprising that macos-14-large is intel and macos-14-xlarge is arm64.
https://docs.github.com/en/actions/using-github-hosted-runners/using-larger-runners/about-larger-runners#about-macos-larger-runners

Copy link
Member

Choose a reason for hiding this comment

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

Note that the large runners are not available in free organizations; we can only use them because CNCF pays for it (or gets time donated by Microsoft, I don't know).

timeout-minutes: 120
strategy:
fail-fast: false
Expand Down
7 changes: 4 additions & 3 deletions hack/test-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ scriptdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${scriptdir}/common.inc.sh"
cd "${scriptdir}/.."

if [ "$#" -ne 2 ]; then
ERROR "Usage: $0 OLDVER NEWVER"
if [ "$#" -ne 3 ]; then
ERROR "Usage: $0 OLDVER NEWVER TEMPLATEURL"
exit 1
fi

OLDVER="$1"
NEWVER="$2"
TEMPLATEURL="$3"

PREFIX="/usr/local"
function install_lima() {
Expand Down Expand Up @@ -64,7 +65,7 @@ export LIMA_INSTANCE="test-upgrade"

INFO "Creating an instance \"${LIMA_INSTANCE}\" with the old Lima"
defer "show_lima_log;limactl delete -f \"${LIMA_INSTANCE}\""
limactl start --tty=false --name="${LIMA_INSTANCE}" template://ubuntu-lts || (
limactl start --tty=false --name="${LIMA_INSTANCE}" "${TEMPLATEURL}" || (
show_lima_log
exit 1
)
Expand Down
Loading