From b93e99042985d4e046c6559ba7f94fd3e45f4d4c Mon Sep 17 00:00:00 2001 From: Georgi Matev Date: Wed, 19 Oct 2022 19:27:20 -0700 Subject: [PATCH] Actually fix the mdgen check (#1241) ## Description The check if the executing `mdgen` binary works on the current platform was not correct since the initial docker run always returns success. ## Type of change - [ ] :sunflower: Feature - [x] :bug: Bugfix - [ ] :world_map: Documentation - [ ] :robot: Test - [ ] :computer: CI/Deployment - [ ] :hamster: Trivial/Minor ## Issue(s) ## Test Plan - [x] :muscle: Manual - [ ] :zap: Unit test - [ ] :green_heart: E2E --- docs/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/Makefile b/docs/Makefile index dc3ae10dd..a7db35d63 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -13,6 +13,11 @@ GOC := docker run --rm -it \ --env GOCACHE=${CORSO_BUILD_CACHE} --env GOMODCACHE=${CORSO_BUILD_MOD} --env GOTMPDIR=${CORSO_BUILD_DIR} \ --workdir ${CORSO_REPO}/src \ golang:1.18 +GOBASHC := docker run --rm -it \ + -v ${CORSO_LOCAL_PATH}:${CORSO_REPO} -v ${CORSO_BUILD_DIR}:${CORSO_BUILD_DIR} \ + --env GOCACHE=${CORSO_BUILD_CACHE} --env GOMODCACHE=${CORSO_BUILD_MOD} --env GOTMPDIR=${CORSO_BUILD_DIR} \ + --workdir ${CORSO_REPO}/src --entrypoint bash \ + golang:1.18 MDGEN_SRC := ${CORSO_REPO}/src/cmd/mdgen/mdgen.go MDGEN_BINARY := ${CORSO_BUILD_BIN}/mdgen CLI_DOCS := ${CORSO_REPO}/docs/docs/cli @@ -46,7 +51,7 @@ genclidocs: _validatemdgen ${MDGEN_BINARY} _validatemdgen: # in case we have a different architecture @echo 'Verifying dependencies...' - $(GOC) ${MDGEN_BINARY} --help >/dev/null || $(GOC) rm -rf ${MDGEN_BINARY} + $(GOBASHC) -c "${MDGEN_BINARY} --help >/dev/null || rm -rf ${MDGEN_BINARY}" ${MDGEN_BINARY}: $(shell find ${CORSO_LOCAL_PATH}/src -type f -name *.go) $(shell find ${CORSO_LOCAL_PATH}/src -type d ) @echo 'Re-building Corso CLI docs auto-gen tooling...'