From 5f0424c94be352b0d1b0ec75311c49113001144e Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 16 Apr 2020 19:31:25 -0700 Subject: [PATCH 1/2] Vagrantfile: rm disabling weak deps 1. it was not working previously because of a typo 2. when a typo is removed, important packages such as container-selinux are not updated, so let's just remove this flag to avoid confusion. Fixes: 84583eb1a4a5a53 Signed-off-by: Kir Kolyshkin --- Vagrantfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index aba0c0cd..444d0770 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -14,7 +14,6 @@ Vagrant.configure("2") do |config| end config.vm.provision "shell", inline: <<-SHELL cat << EOF | dnf -y shell -config install_weak_deps: False update install podman make golang-go libseccomp-devel bats jq ts run From b6cc3975de1ae3dbb1f5792e3cf8a0aa2ffbe412 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 16 Apr 2020 22:51:21 -0700 Subject: [PATCH 2/2] travis: rm BUILDTAGS It is not needed since commit 89c108b1be6d7b8. Signed-off-by: Kir Kolyshkin --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84213ead..6aac8075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: env: - RUNC_USE_SYSTEMD=1 script: - - make BUILDTAGS="${BUILDTAGS}" all + - make all - sudo PATH="$PATH" make localintegration RUNC_USE_SYSTEMD=1 - go: 1.13.x name: "cgroup-v2" @@ -46,10 +46,6 @@ sudo: required services: - docker -env: - global: - - BUILDTAGS="seccomp apparmor selinux" - before_install: - sudo apt-get -qq update - sudo apt-get install -y libseccomp-dev @@ -59,5 +55,5 @@ before_install: script: - git-validation -run DCO,short-subject -v - - make BUILDTAGS="${BUILDTAGS}" - - make BUILDTAGS="${BUILDTAGS}" clean ci cross + - make + - make clean ci cross