opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-20 11:13:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

force bats version to v1.1.0

Browse Source 
We experienced regression when using the latest `v1.2.0-dev` bats in
Ubuntu 20.04 (see github.com/containers/libpod/pull/6418).  Using
bats v1.1.0 worked in the Ubuntu test VM.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2020-06-08 12:33:35 +02:00
parent efd1422143
commit b6148b6576
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -612,7 +612,7 @@ uninstall:
GIT_CHECK_EXCLUDE="./vendor:docs/make.bat" $(GOBIN)/git-validation -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..$(HEAD) GIT_CHECK_EXCLUDE="./vendor:docs/make.bat" $(GOBIN)/git-validation -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..$(HEAD)
.PHONY: install.tools .PHONY: install.tools
install.tools: .install.gitvalidation .install.md2man .install.ginkgo .install.golangci-lint ## Install needed tools install.tools: .install.gitvalidation .install.md2man .install.ginkgo .install.golangci-lint .install.bats ## Install needed tools
define go-get define go-get
env GO111MODULE=off \ env GO111MODULE=off \
@ -635,6 +635,10 @@ endef
.install.golangci-lint: .gopathok .install.golangci-lint: .gopathok
VERSION=1.18.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh VERSION=1.18.0 GOBIN=$(GOBIN) sh ./hack/install_golangci.sh
.PHONY: .install.bats
.install.bats: .gopathok
VERSION=v1.1.0 ./hack/install_bats.sh
.PHONY: .install.pre-commit .PHONY: .install.pre-commit
.install.pre-commit: .install.pre-commit:
if [ -z "$(PRE_COMMIT)" ]; then \ if [ -z "$(PRE_COMMIT)" ]; then \

1
contrib/cirrus/integration_test.sh
View File

@ -52,6 +52,7 @@ case "$SPECIALMODE" in
make make
make install PREFIX=/usr ETCDIR=/etc make install PREFIX=/usr ETCDIR=/etc
make test-binaries make test-binaries
make .install.bats
if [[ "$TEST_REMOTE_CLIENT" == "true" ]] if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
then then
make remote${TESTSUITE} VARLINK_LOG=$VARLINK_LOG make remote${TESTSUITE} VARLINK_LOG=$VARLINK_LOG

16
hack/install_bats.sh Executable file
View File

@ -0,0 +1,16 @@
#!/bin/bash
set -e
die() { echo "${1:-No error message given} (from $(basename $0))"; exit 1; }
buildDir=$(mktemp -d)
git clone https://github.com/bats-core/bats-core $buildDir
pushd $buildDir
pwd
git reset --hard ${VERSION}
./install.sh /usr/local
popd
rm -rf $buildDir