Skip to content

Commit 5bdfe79

Browse files
mbrandenburgerbvavala
authored andcommitted
Remove some make dependencies
- Remove docker build from default build path - Full docker build is still done by CI - Remove build-dep on test and linter to give the developer the freedom to just the stuff they want (make all, or just make, still performs make build test) Signed-off-by: Marcus brandenburger <[email protected]>
1 parent 4bf0f50 commit 5bdfe79

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
DOCKER_QUIET_BUILD: 1
3232
run: |
3333
DOCKER_BUILD_OPTS="--build-arg UBUNTU_VERSION=${{ matrix.os-version }} --build-arg UBUNTU_NAME=${{ matrix.os-name }}" \
34-
make -C utils/docker run DOCKER_DEV_OPTIONAL_CMD='env IS_CI_RUNNING=true \
34+
make -C utils/docker build run DOCKER_DEV_OPTIONAL_CMD='env IS_CI_RUNNING=true \
3535
DOCKER_QUIET_BUILD=1 \
3636
DOCKER_BUILDKIT=0 \
3737
DOCKER_BUILD_OPTS="--build-arg UBUNTU_VERSION=${{ matrix.os-version }} --build-arg UBUNTU_NAME=${{ matrix.os-name }}" \

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ license:
2727
@echo "License: Running licence checks.."
2828
@scripts/check_license.sh
2929

30-
linter: gotools build
30+
linter: gotools
3131
@echo "LINT: Running code checks for Go files..."
3232
@cd $$(/bin/pwd) && ./scripts/golinter.sh
3333
@echo "LINT: Running code checks for Cpp/header files..."

build.mk

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ GO := $(GO_CMD) $(GOFLAGS)
1818
all: build test ci_report checks # keep checks last as license test is brittle ...
1919

2020
.PHONY: test
21-
test: build
2221

2322
.PHONY: ci_report
2423

utils/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
TOP = ..
66
include $(TOP)/build.mk
77

8-
SUB_DIRS = docker fabric
8+
SUB_DIRS = fabric
99

1010
all build test clean clobber:
1111
$(foreach DIR, $(SUB_DIRS), $(MAKE) -C $(DIR) $@ || exit ;)

0 commit comments

Comments
 (0)