Small fixes to our Actions CI workflow

Integration tests were running with latest Go release rather than the
version used everywhere else. Also, we don't need to install protoc from
tarball and also apt-get the package for Ubuntu when used as a
dependency for criu build.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
Phil Estes
2020-04-14 17:03:41 -04:00
parent 9441507fd2
commit 74ceb35f50
4 changed files with 18 additions and 21 deletions

View File

@@ -26,13 +26,14 @@ function install_runc() {
go get -d github.com/opencontainers/runc
cd "$GOPATH"/src/github.com/opencontainers/runc
git checkout $RUNC_COMMIT
make BUILDTAGS='seccomp apparmor selinux' runc install
make BUILDTAGS='apparmor seccomp selinux' runc
sudo make install
}
function install_crun() {
CRUN_VERSION=0.11
curl -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/${CRUN_VERSION}/crun-${CRUN_VERSION}-static-$(uname -m)
chmod +x /usr/local/sbin/runc
sudo curl -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/${CRUN_VERSION}/crun-${CRUN_VERSION}-static-$(uname -m)
sudo chmod +x /usr/local/sbin/runc
}
: ${RUNC_FLAVOR=runc}