mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
merge branch 'pr-2922'
Akihiro Suda (1): CI: update Fedora to 34 LGTMs: mrunalp cyphar Closes #2922
This commit is contained in:
@@ -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
|
||||
Reference in New Issue
Block a user