Merge pull request #10436 from AkihiroSuda/fedora-40
CI: update Fedora to 40
This commit is contained in:
commit
cbb2fc78e9
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -527,7 +527,7 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
box:
|
box:
|
||||||
- fedora/39-cloud-base
|
- fedora/40-cloud-base
|
||||||
# We have to keep EL8 to test old glibc, cgroup, kernel, etc.
|
# We have to keep EL8 to test old glibc, cgroup, kernel, etc.
|
||||||
# The image was changed from rockylinux/8 to almalinux/8,
|
# The image was changed from rockylinux/8 to almalinux/8,
|
||||||
# as the former one no longer works:
|
# as the former one no longer works:
|
||||||
|
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
# Vagrantfile for Fedora and EL
|
# Vagrantfile for Fedora and EL
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/39-cloud-base"
|
config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/40-cloud-base"
|
||||||
# BOX_VERSION is deprecated. Use "BOX=<BOX>@<BOX_VERSION>".
|
# BOX_VERSION is deprecated. Use "BOX=<BOX>@<BOX_VERSION>".
|
||||||
config.vm.box_version = ENV["BOX_VERSION"] || (ENV["BOX"].split("@")[1] if ENV["BOX"])
|
config.vm.box_version = ENV["BOX_VERSION"] || (ENV["BOX"].split("@")[1] if ENV["BOX"])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user