Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: avoid apparent race condition in Make task execution #23

Merged
merged 2 commits into from
Jan 19, 2024
Merged

chore: avoid apparent race condition in Make task execution #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89ee701
fix: avoid apparent race condition in task execution
ctreatma Jan 17, 2024
9bfd6cb
change task order and remove extra gomod files in mod task
ctreatma Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ generate-all:
done

mod:
rm -f go.mod go.sum ${PACKAGE_PREFIX}/${PACKAGE_MAJOR}/go.mod ${PACKAGE_PREFIX}/${PACKAGE_MAJOR}/go.sum
for goModOrSum in $(shell set -x; find . -not \( -path ./examples -prune \) -name go.mod -o -name go.sum | sort -n); do \
rm -f $$goModOrSum;\
done
${GO_CMD} go mod init github.com/${GIT_ORG}/${GIT_REPO}
${GO_CMD} go mod tidy

Expand Down
6 changes: 2 additions & 4 deletions Makefile.metalv1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SPEC_PATCHED_DIR=${SPEC_BASE_DIR}/${PACKAGE_NAME}/oas3.patched

all: pull fetch patch generate stage

generate: clean codegen remove-unused mod patch-post fmt test
generate: clean codegen remove-unused patch-post fmt mod test

pull:
${CRI} pull ${OPENAPI_IMAGE}
Expand Down Expand Up @@ -60,6 +60,4 @@ remove-unused:
rm -rf ${CODE_DIR}/api \
${CODE_DIR}/.travis.yml \
${CODE_DIR}/git_push.sh \
${CODE_DIR}/.openapi-generator \
${CODE_DIR}/go.mod \
${CODE_DIR}/go.sum
${CODE_DIR}/.openapi-generator
6 changes: 2 additions & 4 deletions templates/Makefile.sdk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SPEC_PATCHED_DIR=${SPEC_BASE_DIR}/${PACKAGE_NAME}/oas3.patched

all: pull fetch patch generate stage

generate: clean codegen remove-unused mod patch-post fmt test
generate: clean codegen remove-unused patch-post mod fmt test

pull:
${CRI} pull ${OPENAPI_IMAGE}
Expand Down Expand Up @@ -60,6 +60,4 @@ remove-unused:
rm -rf ${CODE_DIR}/api \
${CODE_DIR}/.travis.yml \
${CODE_DIR}/git_push.sh \
${CODE_DIR}/.openapi-generator \
${CODE_DIR}/go.mod \
${CODE_DIR}/go.sum
${CODE_DIR}/.openapi-generator
Loading