opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14719 from cevich/use_preinstalled_bats

Browse Source 
Cirrus: Use pre-installed bats
This commit is contained in:
OpenShift Merge Robot
2022-07-28 21:05:23 +02:00
committed by GitHub
parent 5eb06e7592 a53a0fca96
commit 509ad4280f
3 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -829,7 +829,7 @@ install.systemd:
endif endif
.PHONY: install.tools .PHONY: install.tools
install.tools: .install.ginkgo .install.golangci-lint .install.bats ## Install needed tools install.tools: .install.ginkgo .install.golangci-lint ## Install needed tools
make -C test/tools make -C test/tools
.PHONY: .install.ginkgo .PHONY: .install.ginkgo
@ -846,10 +846,6 @@ install.tools: .install.ginkgo .install.golangci-lint .install.bats ## Install n
make -C test/tools build/go-md2man ; \ make -C test/tools build/go-md2man ; \
fi fi
.PHONY: .install.bats
.install.bats:
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 \

22
hack/install_bats.sh
View File

@ -1,22 +0,0 @@
#!/usr/bin/env bash
set -e
die() { echo "${1:-No error message given} (from $(basename $0))"; exit 1; }
if [[ "$(type -t bats)" != "" ]]; then
# bats is already installed.
exit 0
fi
buildDir=$(mktemp -d)
git clone https://github.com/bats-core/bats-core $buildDir
pushd $buildDir
pwd
git reset --hard ${VERSION}
echo "Installing bats to /usr/local (requires root)"
sudo ./install.sh /usr/local
popd
rm -rf $buildDir