diff --git a/.ci/Vagrantfile.fedora32 b/.ci/Vagrantfile.fedora33 similarity index 86% rename from .ci/Vagrantfile.fedora32 rename to .ci/Vagrantfile.fedora33 index 68325f3a..73110a8e 100644 --- a/.ci/Vagrantfile.fedora32 +++ b/.ci/Vagrantfile.fedora33 @@ -3,7 +3,7 @@ Vagrant.configure("2") do |config| # Fedora box is used for testing cgroup v2 support - config.vm.box = "fedora/32-cloud-base" + config.vm.box = "fedora/33-cloud-base" config.vm.provider :virtualbox do |v| v.memory = 2048 v.cpus = 2 @@ -20,8 +20,7 @@ Vagrant.configure("2") do |config| cat << EOF | dnf -y shell && break config exclude kernel,kernel-core config install_weak_deps false -update -install make golang-go libseccomp-devel git-core +install make golang-go git-core ts run EOF done diff --git a/.ci/install-vagrant.sh b/.ci/install-vagrant.sh deleted file mode 100755 index f4aa05ae..00000000 --- a/.ci/install-vagrant.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -eux -o pipefail -VAGRANT_VERSION="2.2.10" - -# Based on code from https://github.com/opencontainers/runc -DEB="vagrant_${VAGRANT_VERSION}_$(uname -m).deb" -wget "https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/$DEB" -apt-get update -apt-get install -q -y \ - bridge-utils \ - dnsmasq-base \ - ebtables \ - libvirt-bin \ - libvirt-dev \ - qemu-kvm \ - qemu-utils \ - ruby-dev \ - ./"$DEB" -rm -f "$DEB" -vagrant plugin install vagrant-libvirt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 784a810d..34e9f7f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,3 +25,22 @@ jobs: - name: Cross build if: ${{ runner.os == 'Linux' }} run: make cross + + # some features, like openat2, require a newer kernel + fedora: + # nested virtualization is only available on macOS hosts + runs-on: macos-10.15 + steps: + - uses: actions/checkout@v2 + - name: prepare vagrant + run: | + ln -sf .ci/Vagrantfile.fedora33 Vagrantfile + # Retry if it fails (download.fedoraproject.org returns 404 sometimes) + vagrant up || vagrant up + vagrant ssh-config >> ~/.ssh/config + + - name: system info + run: ssh default 'sh -exc "uname -a && df -T"' + + - name: tests + run: ssh default 'cd /vagrant && sudo make test' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bcf2819a..00000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -dist: bionic -os: linux -language: minimal -cache: - directories: - - /home/travis/.vagrant.d/boxes -jobs: - include: - - name: "Fedora 32" - before_install: - - sudo .ci/install-vagrant.sh - - ln -sf .ci/Vagrantfile.fedora32 Vagrantfile - - sudo vagrant up && sudo mkdir -p /root/.ssh && sudo sh -c "vagrant ssh-config >> /root/.ssh/config" - script: - - sudo ssh default -t 'cd /vagrant && sudo make'