diff options
| author | Chris Evich <cevich@redhat.com> | 2022-06-23 16:58:45 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2022-07-28 11:15:44 -0400 |
| commit | a24cc463a021c0958bc28a1d96975612d65b79a9 (patch) | |
| tree | 2110d170cd7b94973bf8954f862ec23f6116d770 | |
| parent | feb7bffbc9d849326cd95f36ffa45a3c0e2e7047 (diff) | |
| download | podman-a24cc463a021c0958bc28a1d96975612d65b79a9.tar.gz podman-a24cc463a021c0958bc28a1d96975612d65b79a9.tar.bz2 podman-a24cc463a021c0958bc28a1d96975612d65b79a9.zip | |
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>
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | hack/install_bats.sh | 22 |
2 files changed, 1 insertions, 27 deletions
@@ -825,7 +825,7 @@ install.systemd: endif .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 .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 ; \ fi -.PHONY: .install.bats -.install.bats: - VERSION=v1.1.0 ./hack/install_bats.sh - .PHONY: .install.pre-commit .install.pre-commit: if [ -z "$(PRE_COMMIT)" ]; then \ diff --git a/hack/install_bats.sh b/hack/install_bats.sh deleted file mode 100755 index 01de8b7c6..000000000 --- a/hack/install_bats.sh +++ /dev/null @@ -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 |