mirror of
https://github.com/containers/podman.git
synced 2025-09-19 23:03:16 +08:00
force bats version to v1.1.0
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:
6
Makefile
6
Makefile
@ -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)
|
||||
|
||||
.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
|
||||
env GO111MODULE=off \
|
||||
@ -635,6 +635,10 @@ endef
|
||||
.install.golangci-lint: .gopathok
|
||||
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
|
||||
.install.pre-commit:
|
||||
if [ -z "$(PRE_COMMIT)" ]; then \
|
||||
|
@ -52,6 +52,7 @@ case "$SPECIALMODE" in
|
||||
make
|
||||
make install PREFIX=/usr ETCDIR=/etc
|
||||
make test-binaries
|
||||
make .install.bats
|
||||
if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
|
||||
then
|
||||
make remote${TESTSUITE} VARLINK_LOG=$VARLINK_LOG
|
||||
|
16
hack/install_bats.sh
Executable file
16
hack/install_bats.sh
Executable 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
|
Reference in New Issue
Block a user