Skip to content

Commit bd7f6ab

Browse files
authored
Fix shell in Makefile (#839)
Move SHELL definition ahead of any $(shell) use. Signed-off-by: Todd Short <[email protected]>
1 parent 9bbc444 commit bd7f6ab

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
###########################
22
# Configuration Variables #
33
###########################
4+
# Setting SHELL to bash allows bash commands to be executed by recipes.
5+
# Options are set to exit when a recipe line exits non-zero or a piped command fails.
6+
SHELL := /usr/bin/env bash -o pipefail
7+
.SHELLFLAGS := -ec
8+
49
# Image URL to use all building/pushing image targets
510
ifeq ($(origin IMAGE_REPO), undefined)
611
IMAGE_REPO := quay.io/operator-framework/operator-controller
@@ -14,7 +19,6 @@ export IMAGE_TAG
1419

1520
IMG := $(IMAGE_REPO):$(IMAGE_TAG)
1621

17-
1822
# Define dependency versions (use go.mod if we also use Go code from dependency)
1923
export CERT_MGR_VERSION := v1.9.0
2024
export CATALOGD_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/catalogd)
@@ -51,11 +55,6 @@ endif
5155

5256
KUSTOMIZE_BUILD_DIR := config/default
5357

54-
# Setting SHELL to bash allows bash commands to be executed by recipes.
55-
# Options are set to exit when a recipe line exits non-zero or a piped command fails.
56-
SHELL := /usr/bin/env bash -o pipefail
57-
.SHELLFLAGS := -ec
58-
5958
# Disable -j flag for make
6059
.NOTPARALLEL:
6160

0 commit comments

Comments
 (0)