From a9f189e16b2d9f3d0ceac6416303ba339ad6e6dc Mon Sep 17 00:00:00 2001 From: Catarina Paralta <46568597+paralta@users.noreply.github.com> Date: Thu, 15 Feb 2024 13:00:10 +0000 Subject: [PATCH] refactor: code review --- Makefile | 6 +++--- RELEASE.md | 2 +- makefile.d/20-tools.mk | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 380ba18eee..7b442a621f 100644 --- a/Makefile +++ b/Makefile @@ -511,15 +511,15 @@ $(DIST_DIR)/CHANGELOG.md: $(ROOT_DIR)/cliff.toml bin/git-cliff | $(DIST_DIR) .PHONY: multimod-verify multimod-verify: bin/multimod @echo "Validating versions.yaml file" - $(MULTIMOD) verify + $(MULTIMOD_BIN) verify .PHONY: multimod-prerelease multimod-prerelease: bin/multimod - $(MULTIMOD) prerelease --all-module-sets --skip-go-mod-tidy=true --commit-to-different-branch=false + $(MULTIMOD_BIN) prerelease --all-module-sets --skip-go-mod-tidy=true --commit-to-different-branch=false .PHONY: multimod-push-tags multimod-push-tags: bin/multimod - set -e; for tag in `$(MULTIMOD) tag --module-set-name vmclarity --commit-hash HEAD --print-tags | grep -v "Using" `; do \ + set -e; for tag in `$(MULTIMOD_BIN) tag --module-set-name vmclarity --commit-hash HEAD --print-tags | grep -v "Using" `; do \ echo "pushing tag $${tag}"; \ git push origin $${tag}; \ done; diff --git a/RELEASE.md b/RELEASE.md index 8e73fe53db..48fa8e00ce 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,7 +10,7 @@ git checkout -b release/v0.7.0 ``` * Modify the `versions.yaml` file to update the version for VMClarity's module-set. Keep in mind that the same version is applied to all modules. -``` +```diff vmclarity: - version: v0.6.0 + version: v0.7.0 diff --git a/makefile.d/20-tools.mk b/makefile.d/20-tools.mk index b36f5b309a..a8d5e81fe0 100644 --- a/makefile.d/20-tools.mk +++ b/makefile.d/20-tools.mk @@ -238,7 +238,6 @@ bin/typos-$(TYPOS_VERSION): | $(BIN_DIR) MULTIMOD_BIN := $(BIN_DIR)/multimod MULTIMOD_REPO_DIR := $(BIN_DIR)/opentelemetry-go-build-tools -MULTIMOD := $(BIN_DIR)/multimod bin/multimod: @if [ ! -d $(MULTIMOD_REPO_DIR) ]; then git clone git@github.com:open-telemetry/opentelemetry-go-build-tools.git $(MULTIMOD_REPO_DIR); fi