Skip to content

Commit 2a35663

Browse files
authored
Merge pull request #2542 from AkihiroSuda/ci-ubuntu-24.04
CI: use ubuntu-24.04
2 parents b63f6cf + 2216d0f commit 2a35663

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
jobs:
2121
lints:
2222
name: "Lints"
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-24.04
2424
timeout-minutes: 30
2525
steps:
2626
- uses: actions/checkout@v4
@@ -66,7 +66,7 @@ jobs:
6666

6767
unit:
6868
name: "Unit tests"
69-
runs-on: ubuntu-22.04
69+
runs-on: ubuntu-24.04
7070
timeout-minutes: 30
7171
strategy:
7272
fail-fast: false
@@ -204,7 +204,7 @@ jobs:
204204
# as they seem more stable than macOS instances.
205205
integration-linux:
206206
name: Integration tests (on Linux)
207-
runs-on: ubuntu-22.04
207+
runs-on: ubuntu-24.04
208208
timeout-minutes: 120
209209
strategy:
210210
fail-fast: false
@@ -269,7 +269,7 @@ jobs:
269269

270270
colima:
271271
name: Colima
272-
runs-on: ubuntu-22.04
272+
runs-on: ubuntu-24.04
273273
timeout-minutes: 120
274274
strategy:
275275
matrix:

pkg/cidata/cidata.TEMPLATE.d/boot/05-lima-disks.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ for i in $(seq 0 $((LIMA_CIDATA_DISKS - 1))); do
2929
fi
3030

3131
mkdir -p "/mnt/lima-${DISK_NAME}"
32-
mount -t $FORMAT_FSTYPE "/dev/${DEVICE_NAME}1" "/mnt/lima-${DISK_NAME}"
32+
mount -t "$FORMAT_FSTYPE" "/dev/${DEVICE_NAME}1" "/mnt/lima-${DISK_NAME}"
3333
if command -v growpart >/dev/null 2>&1 && command -v resize2fs >/dev/null 2>&1; then
3434
growpart "/dev/${DEVICE_NAME}" 1 || true
3535
# Only resize when filesystem is in a healthy state

0 commit comments

Comments
 (0)