Merge pull request #10436 from AkihiroSuda/fedora-40

CI: update Fedora to 40
This commit is contained in:
Akihiro Suda 2024-07-07 11:15:11 +00:00 committed by GitHub
commit cbb2fc78e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -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
View File

@ -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"])