mirror of https://github.com/containers/podman.git
Remove bats installation script and make target
While convenient, it can be problematic to rely on a Makefile to install software. This was found to be the case across multiple environments WRT `bats`. Fix this by removing the install script and target. A future commit will ensure the correct version of `bats` is present in all CI environments where it's required. Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
parent
feb7bffbc9
commit
a24cc463a0
6
Makefile
6
Makefile
|
@ -825,7 +825,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
|
||||||
|
@ -842,10 +842,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 \
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in New Issue