merge branch 'pr-2922'

Akihiro Suda (1):
  CI: update Fedora to 34

LGTMs: mrunalp cyphar
Closes #2922
This commit is contained in:
Aleksa Sarai
2021-04-28 10:13:11 +10:00
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -82,15 +82,15 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: "Cache ~/.vagrant.d/boxes, using hash of Vagrantfile.fedora33"
- name: "Cache ~/.vagrant.d/boxes, using hash of Vagrantfile.fedora34"
uses: actions/cache@v2
with:
path: ~/.vagrant.d/boxes
key: vagrant-${{ hashFiles('Vagrantfile.fedora33') }}
key: vagrant-${{ hashFiles('Vagrantfile.fedora34') }}
- name: prepare vagrant
run: |
ln -sf Vagrantfile.fedora33 Vagrantfile
ln -sf Vagrantfile.fedora34 Vagrantfile
# Retry if it fails (download.fedoraproject.org returns 404 sometimes)
vagrant up || vagrant up
vagrant ssh-config >> ~/.ssh/config
@@ -3,7 +3,7 @@
Vagrant.configure("2") do |config|
# Fedora box is used for testing cgroup v2 support
config.vm.box = "fedora/33-cloud-base"
config.vm.box = "fedora/34-cloud-base"
config.vm.provider :virtualbox do |v|
v.memory = 2048
v.cpus = 2