From aea6b18635ed01f1068d93b60a7e2a9c9f2cc1b7 Mon Sep 17 00:00:00 2001 From: Mikail Bagishov Date: Sat, 23 Jan 2021 20:55:01 +0300 Subject: [PATCH 01/14] Run vagrant in linux --- .github/workflows/rust.yml | 6 +----- ci/linux.sh | 17 ++--------------- 2 files changed, 3 insertions(+), 20 deletions(-) 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..e7944c0a 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -2,23 +2,9 @@ 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 @@ -30,6 +16,7 @@ Vagrant.configure("2") do |config| config.vm.provider "virtualbox" do |vb| vb.memory = "900" + vb.customize ["modifyvm", :id, "--hwvirtex", "off"] end end EOF @@ -41,7 +28,7 @@ EOF echo "::group::Installing rust" sudo vagrant ssh --command "curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable" echo "::group::Entering VM" - sudo vagrant ssh --command "bash -c 'cd /vagrant && CI_OS=$CI_OS CI_CGROUPS=$CI_CGROUPS CI_TARGET=$CI_TARGET CI_VM=1 bash ci/linux.sh'" + sudo vagrant ssh --command "bash -c 'cd /vagrant && CI_CGROUPS=$CI_CGROUPS CI_TARGET=$CI_TARGET CI_VM=1 bash ci/linux.sh'" echo "Host: pulling logs from VM" sudo vagrant ssh --command "cat /vagrant/logs.zip | base64" | base64 --decode > logs.zip rm stracez-dummy From 9440c58d002cb833ab45182494963ad076c7dd3d Mon Sep 17 00:00:00 2001 From: Mikail Bagishov Date: Sat, 23 Jan 2021 20:57:15 +0300 Subject: [PATCH 02/14] inst vagrant --- ci/linux.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/linux.sh b/ci/linux.sh index e7944c0a..dd2b53b1 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -9,6 +9,8 @@ echo "::group::Preparing" if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then echo "::group::Preparing virtual machine" + wget https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.deb -O vagrant.deb + sudo dpkg -i vagrant.deb vagrant --version cat > Vagrantfile < Date: Sat, 23 Jan 2021 21:00:12 +0300 Subject: [PATCH 03/14] do not use top --- ci/linux.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/linux.sh b/ci/linux.sh index dd2b53b1..11f5dd4d 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -9,7 +9,7 @@ echo "::group::Preparing" if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then echo "::group::Preparing virtual machine" - wget https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.deb -O vagrant.deb + wget https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.deb -q -O vagrant.deb sudo dpkg -i vagrant.deb vagrant --version cat > Vagrantfile < Date: Sat, 23 Jan 2021 21:13:26 +0300 Subject: [PATCH 04/14] install vbox --- ci/linux.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/linux.sh b/ci/linux.sh index 11f5dd4d..e90cd68e 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -10,6 +10,8 @@ echo "::group::Preparing" if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then echo "::group::Preparing virtual machine" 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 + sudo dpkg -i vb.deb sudo dpkg -i vagrant.deb vagrant --version cat > Vagrantfile < Date: Sat, 23 Jan 2021 21:15:31 +0300 Subject: [PATCH 05/14] install vbox from apt --- ci/linux.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/linux.sh b/ci/linux.sh index e90cd68e..5f182d9f 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -9,9 +9,11 @@ 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 -y virtualbox-5.2 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 - sudo dpkg -i vb.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 + #sudo dpkg -i vb.deb sudo dpkg -i vagrant.deb vagrant --version cat > Vagrantfile < Date: Sat, 23 Jan 2021 21:19:28 +0300 Subject: [PATCH 06/14] vbox missing in apt :( --- ci/linux.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/linux.sh b/ci/linux.sh index 5f182d9f..b14c3131 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -10,10 +10,10 @@ 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 -y virtualbox-5.2 + #sudo apt-get install -y virtualbox-5.2 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 - #sudo dpkg -i vb.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 + sudo dpkg -i vb.deb sudo dpkg -i vagrant.deb vagrant --version cat > Vagrantfile < Date: Sat, 23 Jan 2021 21:23:55 +0300 Subject: [PATCH 07/14] install deps --- ci/linux.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/linux.sh b/ci/linux.sh index b14c3131..15ee9204 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -10,7 +10,8 @@ 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 -y virtualbox-5.2 + sudo apt-get install -y libopus0 libqt5core5a libqt5gui5 libqt5opengl5 libqt5printsupport5 \ + libqt5widgets5 libqt5x11extras5 libsdl1.2debian libvpx5 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 sudo dpkg -i vb.deb From ddaf39f4f9926e70cea0cfb6ef1328b7e8a7e9d5 Mon Sep 17 00:00:00 2001 From: Mikail Bagishov Date: Sat, 23 Jan 2021 21:27:45 +0300 Subject: [PATCH 08/14] install libvpx manually --- ci/linux.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/linux.sh b/ci/linux.sh index 15ee9204..7a1fc916 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -11,9 +11,11 @@ if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then echo "::group::Preparing virtual machine" sudo apt-get update sudo apt-get install -y libopus0 libqt5core5a libqt5gui5 libqt5opengl5 libqt5printsupport5 \ - libqt5widgets5 libqt5x11extras5 libsdl1.2debian libvpx5 + libqt5widgets5 libqt5x11extras5 libsdl1.2debian 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 + http://security.ubuntu.com/ubuntu/pool/main/libv/libvpx/libvpx5_1.7.0-3ubuntu0.18.04.1_amd64.deb -q -O libvpx.deb + sudo dkpg -i libvpx.deb sudo dpkg -i vb.deb sudo dpkg -i vagrant.deb vagrant --version From 7e50687220daec4b3af98bd7f936ed53be42d332 Mon Sep 17 00:00:00 2001 From: Mikail Bagishov Date: Sat, 23 Jan 2021 21:29:30 +0300 Subject: [PATCH 09/14] missing wget --- ci/linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/linux.sh b/ci/linux.sh index 7a1fc916..de49a428 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -14,7 +14,7 @@ if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then libqt5widgets5 libqt5x11extras5 libsdl1.2debian 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 - http://security.ubuntu.com/ubuntu/pool/main/libv/libvpx/libvpx5_1.7.0-3ubuntu0.18.04.1_amd64.deb -q -O libvpx.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 dkpg -i libvpx.deb sudo dpkg -i vb.deb sudo dpkg -i vagrant.deb From 54b351715383a321767524a5e22640c501af9ee0 Mon Sep 17 00:00:00 2001 From: Mikail Bagishov Date: Sat, 23 Jan 2021 21:31:21 +0300 Subject: [PATCH 10/14] dkpg --- ci/linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/linux.sh b/ci/linux.sh index de49a428..110a4038 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -15,7 +15,7 @@ if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then 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 dkpg -i libvpx.deb + sudo dpkg -i libvpx.deb sudo dpkg -i vb.deb sudo dpkg -i vagrant.deb vagrant --version From 21ded6a2302c1b075d3812e00580d46658f48971 Mon Sep 17 00:00:00 2001 From: Mikail Bagishov Date: Sat, 23 Jan 2021 21:33:23 +0300 Subject: [PATCH 11/14] install python --- ci/linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/linux.sh b/ci/linux.sh index 110a4038..b76f8cc8 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -11,7 +11,7 @@ if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then echo "::group::Preparing virtual machine" sudo apt-get update sudo apt-get install -y libopus0 libqt5core5a libqt5gui5 libqt5opengl5 libqt5printsupport5 \ - libqt5widgets5 libqt5x11extras5 libsdl1.2debian + 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 From 32dd374b9b9b00ab02b7b92433e8a0a439574551 Mon Sep 17 00:00:00 2001 From: Mikail Bagishov Date: Sat, 23 Jan 2021 21:57:12 +0300 Subject: [PATCH 12/14] try qemu --- ci/linux.sh | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/ci/linux.sh b/ci/linux.sh index b76f8cc8..24a4d5f9 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -10,23 +10,27 @@ 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 -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 + sudo apt-get install qemu-system-x86_64 + #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 < Date: Sat, 23 Jan 2021 21:59:55 +0300 Subject: [PATCH 13/14] qemu-system --- ci/linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/linux.sh b/ci/linux.sh index 24a4d5f9..02e5325d 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -10,7 +10,7 @@ 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-x86_64 + 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 From ab0563db550605143df65a990ef325baf0f75702 Mon Sep 17 00:00:00 2001 From: Mikail Bagishov Date: Sat, 23 Jan 2021 22:02:44 +0300 Subject: [PATCH 14/14] install vagrant --- ci/linux.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/linux.sh b/ci/linux.sh index 02e5325d..91d633ac 100644 --- a/ci/linux.sh +++ b/ci/linux.sh @@ -13,13 +13,13 @@ if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then 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://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 + sudo dpkg -i vagrant.deb + vagrant --version cat > Vagrantfile <