diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 41f89f6c..0bc3f8c1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -38,15 +38,12 @@ jobs: tests-linux: strategy: matrix: - os: - - 'ubuntu-20.04' - - 'macos-latest' rust-target: - 'x86_64-unknown-linux-musl' cgroups: - 'cgroup-v1' - 'cgroup-v2' - runs-on: ${{ matrix.os }} + runs-on: 'ubuntu-20.04' steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1.0.6 @@ -59,7 +56,6 @@ jobs: env: CI_TARGET: ${{ matrix.rust-target }} CI_CGROUPS: ${{ matrix.cgroups }} - CI_OS: ${{ matrix.os }} - name: Collect logs if: always() run: | diff --git a/ci/linux.sh b/ci/linux.sh index f28acbd9..91d633ac 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -2,38 +2,37 @@ set -euo pipefail echo "::group::Info" echo "Target: $CI_TARGET" echo "Cgroup version: $CI_CGROUPS" -echo "Operating system: $CI_OS" echo "this is hack, ignore this file" >> ./stracez-dummy -if [[ $CI_OS == "ubuntu-20.04" ]]; then - if [[ $CI_CGROUPS == "cgroup-v2" ]]; then - echo "Skipping: cgroup v2 runs in macos" - exit 0 - fi -fi -if [[ $CI_OS == "macos-latest" ]]; then - if [[ $CI_CGROUPS == "cgroup-v1" ]]; then - echo "Skipping: cgroup v1 does not need virtualization" - exit 0 - fi -fi - echo "::group::Preparing" if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then echo "::group::Preparing virtual machine" + sudo apt-get update + sudo apt-get install qemu-system + #sudo apt-get install -y libopus0 libqt5core5a libqt5gui5 libqt5opengl5 libqt5printsupport5 \ + # libqt5widgets5 libqt5x11extras5 libsdl1.2debian python + wget https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.deb -q -O vagrant.deb + #wget https://download.virtualbox.org/virtualbox/5.2.44/virtualbox-5.2_5.2.44-139111~Ubuntu~bionic_amd64.deb -q -O vb.deb + #wget http://security.ubuntu.com/ubuntu/pool/main/libv/libvpx/libvpx5_1.7.0-3ubuntu0.18.04.1_amd64.deb -q -O libvpx.deb + #sudo dpkg -i libvpx.deb + #sudo dpkg -i vb.deb + sudo dpkg -i vagrant.deb vagrant --version cat > Vagrantfile < logs.zip rm stracez-dummy