Skip to content

Commit 06fbf61

Browse files
marcofranssenjoshuabaird
authored andcommitted
makefile: Remove chmod+x (fluent#1521)
Files are already commited with the executable bit set for these files Signed-off-by: Marco Franssen <[email protected]>
1 parent 2c3e883 commit 06fbf61

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

Makefile

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
2-
FB_VERSION?=$(shell cat cmd/fluent-watcher/fluentbit/VERSION | tr -d " \t\n\r")
1+
MAKEFLAGS = --warn-undefined-variables
2+
3+
# Setting SHELL to bash allows bash commands to be executed by recipes.
4+
# This is a requirement for 'setup-envtest.sh' in the test target.
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+
9+
VERSION ?= $(shell cat VERSION | tr -d " \t\n\r")
10+
FB_VERSION ?= $(shell cat cmd/fluent-watcher/fluentbit/VERSION | tr -d " \t\n\r")
311
# Image URL to use all building/pushing image targets
412
FB_IMG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}
513
FB_IMG_DEBUG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}-debug
@@ -10,21 +18,15 @@ FD_IMG_BASE ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-arm64-base
1018
ARCH ?= arm64
1119

1220
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
13-
CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,allowDangerousTypes=true"
21+
CRD_OPTIONS ?= crd:generateEmbeddedObjectMeta=true,allowDangerousTypes=true
1422

1523
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
1624
ifeq (,$(shell go env GOBIN))
17-
GOBIN=$(shell go env GOPATH)/bin
25+
GOBIN = $(shell go env GOPATH)/bin
1826
else
19-
GOBIN=$(shell go env GOBIN)
27+
GOBIN = $(shell go env GOBIN)
2028
endif
2129

22-
# Setting SHELL to bash allows bash commands to be executed by recipes.
23-
# This is a requirement for 'setup-envtest.sh' in the test target.
24-
# Options are set to exit when a recipe line exits non-zero or a piped command fails.
25-
SHELL = /usr/bin/env bash -o pipefail
26-
.SHELLFLAGS = -ec
27-
2830
all: build
2931

3032
##@ General
@@ -86,10 +88,10 @@ binary:
8688
verify: verify-crds verify-codegen
8789

8890
verify-crds:
89-
chmod a+x ./hack/verify-crds.sh && ./hack/verify-crds.sh
91+
./hack/verify-crds.sh
9092

9193
verify-codegen:
92-
chmod a+x ./hack/verify-codegen.sh && ./hack/verify-codegen.sh
94+
./hack/verify-codegen.sh
9395

9496
build: generate fmt vet ## Build manager binary.
9597
go build -o bin/fluent-manager cmd/fluent-manager/main.go
@@ -134,7 +136,7 @@ build-fd-arm64: prepare-build
134136

135137
# Prepare for arm64 building
136138
prepare-build:
137-
chmod +x cmd/fluent-watcher/hooks/post-hook.sh && bash cmd/fluent-watcher/hooks/post-hook.sh
139+
cmd/fluent-watcher/hooks/post-hook.sh
138140

139141
# Push the amd64 docker image
140142
push-amd64:
@@ -193,10 +195,10 @@ docs-update: # update api docs
193195
go run ./cmd/doc-gen/main.go
194196

195197
e2e: ginkgo # make e2e tests
196-
chmod a+x tests/scripts/fluentd_e2e.sh && bash tests/scripts/fluentd_e2e.sh
198+
tests/scripts/fluentd_e2e.sh
197199

198200
helm-e2e: ginkgo # make helm e2e tests
199-
chmod a+x tests/scripts/fluentd_helm_e2e.sh && bash tests/scripts/fluentd_helm_e2e.sh
201+
tests/scripts/fluentd_helm_e2e.sh
200202

201203
update-helm-package: # update helm repo
202-
chmod a+x ./hack/update-helm-package.sh && ./hack/update-helm-package.sh
204+
./hack/update-helm-package.sh

cmd/fluent-watcher/hooks/post-hook.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)