From bd253e1ff7e9ed65cf630de0a0c386f3b6261dac Mon Sep 17 00:00:00 2001 From: Igor Gov Date: Sun, 6 Feb 2022 20:35:41 +0200 Subject: [PATCH] Fix cli build param ver (#758) Co-authored-by: Igor Gov --- .github/workflows/release.yml | 6 +++--- Dockerfile | 4 ++-- Makefile | 2 +- agent/keto/build-push-featurebranch.sh | 6 +++--- agent/kratos/build-push-featurebranch.sh | 6 +++--- agent/pkg/controllers/metadata_controller.go | 2 +- agent/pkg/version/consts.go | 2 +- cli/Makefile | 6 +++--- cli/README.md.TEMPLATE | 12 ++++++------ cli/apiserver/provider.go | 2 +- cli/mizu/version/versionCheck.go | 2 +- devops/build-agent-ci.sh | 6 +++--- devops/build-push-featurebranch.sh | 6 +++--- shared/models.go | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c0eb9971..cb89110d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,7 +78,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-args: | TARGETARCH=${{ matrix.target }} - SEM_VER=${{ steps.versioning.outputs.version }} + VER=${{ steps.versioning.outputs.version }} BUILD_TIMESTAMP=${{ steps.version_parameters.outputs.build_timestamp }} GIT_BRANCH=${{ steps.version_parameters.outputs.branch }} COMMIT_HASH=${{ github.sha }} @@ -162,7 +162,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-args: | TARGETARCH=${{ matrix.target }} - SEM_VER=${{ steps.versioning.outputs.version }} + VER=${{ steps.versioning.outputs.version }} BUILD_TIMESTAMP=${{ steps.version_parameters.outputs.build_timestamp }} GIT_BRANCH=${{ steps.version_parameters.outputs.branch }} COMMIT_HASH=${{ github.sha }} @@ -265,7 +265,7 @@ jobs: id: version_parameters - name: Build and Push CLI - run: make push-cli SEM_VER='${{ steps.versioning.outputs.version }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}' + run: make push-cli VER='${{ steps.versioning.outputs.version }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}' - name: Log the version into a .txt file shell: bash diff --git a/Dockerfile b/Dockerfile index 9b1bac46a..f20e1ef17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,7 +67,7 @@ COPY agent . ARG COMMIT_HASH ARG GIT_BRANCH ARG BUILD_TIMESTAMP -ARG SEM_VER=0.0.0 +ARG VER=0.0 WORKDIR /app/agent-build @@ -75,7 +75,7 @@ RUN go build -ldflags="-extldflags=-static -s -w \ -X 'github.com/up9inc/mizu/agent/pkg/version.GitCommitHash=${COMMIT_HASH}' \ -X 'github.com/up9inc/mizu/agent/pkg/version.Branch=${GIT_BRANCH}' \ -X 'github.com/up9inc/mizu/agent/pkg/version.BuildTimestamp=${BUILD_TIMESTAMP}' \ - -X 'github.com/up9inc/mizu/agent/pkg/version.SemVer=${SEM_VER}'" -o mizuagent . + -X 'github.com/up9inc/mizu/agent/pkg/version.Ver=${VER}'" -o mizuagent . # Download Basenine executable, verify the sha1sum ADD https://github.com/up9inc/basenine/releases/download/v0.4.13/basenine_linux_${GOARCH} ./basenine_linux_${GOARCH} diff --git a/Makefile b/Makefile index e84159a45..5f38c6094 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ help: ## This help. TS_SUFFIX="$(shell date '+%s')" GIT_BRANCH="$(shell git branch | grep \* | cut -d ' ' -f2 | tr '[:upper:]' '[:lower:]' | tr '/' '_')" BUCKET_PATH=static.up9.io/mizu/$(GIT_BRANCH) -export SEM_VER?=0.0.0 +export VER?=0.0 ui: ## Build UI. @(cd ui; npm i ; npm run build; ) diff --git a/agent/keto/build-push-featurebranch.sh b/agent/keto/build-push-featurebranch.sh index 8bb6d1340..e5be6cc98 100755 --- a/agent/keto/build-push-featurebranch.sh +++ b/agent/keto/build-push-featurebranch.sh @@ -7,9 +7,9 @@ SERVER_NAME=mizu-keto GIT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | tr '[:upper:]' '[:lower:]') DOCKER_REPO=$REPOSITORY/$SERVER_NAME/$GIT_BRANCH -SEM_VER=${SEM_VER=0.0.0} +VER=${VER=0.0} -DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$SEM_VER") +DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$VER") if [ "$GIT_BRANCH" = 'develop' -o "$GIT_BRANCH" = 'master' -o "$GIT_BRANCH" = 'main' ] then @@ -19,7 +19,7 @@ fi echo "building ${DOCKER_TAGGED_BUILDS[@]}" DOCKER_TAGS_ARGS=$(echo ${DOCKER_TAGGED_BUILDS[@]/#/-t }) # "-t FIRST_TAG -t SECOND_TAG ..." -docker build $DOCKER_TAGS_ARGS --build-arg SEM_VER=${SEM_VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} . +docker build $DOCKER_TAGS_ARGS --build-arg VER=${VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} . for DOCKER_TAG in "${DOCKER_TAGGED_BUILDS[@]}" do diff --git a/agent/kratos/build-push-featurebranch.sh b/agent/kratos/build-push-featurebranch.sh index 069114c23..d52d05d96 100755 --- a/agent/kratos/build-push-featurebranch.sh +++ b/agent/kratos/build-push-featurebranch.sh @@ -7,9 +7,9 @@ SERVER_NAME=mizu-kratos GIT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | tr '[:upper:]' '[:lower:]') DOCKER_REPO=$REPOSITORY/$SERVER_NAME/$GIT_BRANCH -SEM_VER=${SEM_VER=0.0.0} +VER=${VER=0.0.0} -DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$SEM_VER") +DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$VER") if [ "$GIT_BRANCH" = 'develop' -o "$GIT_BRANCH" = 'master' -o "$GIT_BRANCH" = 'main' ] then @@ -19,7 +19,7 @@ fi echo "building ${DOCKER_TAGGED_BUILDS[@]}" DOCKER_TAGS_ARGS=$(echo ${DOCKER_TAGGED_BUILDS[@]/#/-t }) # "-t FIRST_TAG -t SECOND_TAG ..." -docker build $DOCKER_TAGS_ARGS --build-arg SEM_VER=${SEM_VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} . +docker build $DOCKER_TAGS_ARGS --build-arg VER=${VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} . for DOCKER_TAG in "${DOCKER_TAGGED_BUILDS[@]}" do diff --git a/agent/pkg/controllers/metadata_controller.go b/agent/pkg/controllers/metadata_controller.go index 45021b710..223c8582a 100644 --- a/agent/pkg/controllers/metadata_controller.go +++ b/agent/pkg/controllers/metadata_controller.go @@ -9,6 +9,6 @@ import ( ) func GetVersion(c *gin.Context) { - resp := shared.VersionResponse{SemVer: version.SemVer} + resp := shared.VersionResponse{Ver: version.Ver} c.JSON(http.StatusOK, resp) } diff --git a/agent/pkg/version/consts.go b/agent/pkg/version/consts.go index 79742f5ce..e9d0b179f 100644 --- a/agent/pkg/version/consts.go +++ b/agent/pkg/version/consts.go @@ -1,7 +1,7 @@ package version var ( - SemVer = "0.0.1" + Ver = "0.0.1" Branch = "develop" GitCommitHash = "" // this var is overridden using ldflags in makefile when building BuildTimestamp = "" // this var is overridden using ldflags in makefile when building diff --git a/cli/Makefile b/cli/Makefile index 9552a5ec9..e237e805e 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -3,7 +3,7 @@ COMMIT_HASH=$(shell git rev-parse HEAD) GIT_BRANCH=$(shell git branch --show-current | tr '[:upper:]' '[:lower:]') GIT_VERSION=$(shell git branch --show-current | tr '[:upper:]' '[:lower:]') BUILD_TIMESTAMP=$(shell date +%s) -export SEM_VER?=0.0.0 +export VER?=0.0 .PHONY: help .DEFAULT_GOAL := help @@ -23,13 +23,13 @@ build: ## Build mizu CLI binary (select platform via GOOS / GOARCH env variables -X 'github.com/up9inc/mizu/cli/mizu.Branch=$(GIT_BRANCH)' \ -X 'github.com/up9inc/mizu/cli/mizu.BuildTimestamp=$(BUILD_TIMESTAMP)' \ -X 'github.com/up9inc/mizu/cli/mizu.Platform=$(SUFFIX)' \ - -X 'github.com/up9inc/mizu/cli/mizu.SemVer=$(SEM_VER)'" \ + -X 'github.com/up9inc/mizu/cli/mizu.Ver=$(VER)'" \ -o bin/mizu_$(SUFFIX) mizu.go (cd bin && shasum -a 256 mizu_${SUFFIX} > mizu_${SUFFIX}.sha256) build-all: ## Build for all supported platforms. @echo "Compiling for every OS and Platform" - @mkdir -p bin && sed s/_SEM_VER_/$(SEM_VER)/g README.md.TEMPLATE > bin/README.md + @mkdir -p bin && sed s/_VER_/$(VER)/g README.md.TEMPLATE > bin/README.md @$(MAKE) build GOOS=linux GOARCH=amd64 @$(MAKE) build GOOS=linux GOARCH=arm64 @$(MAKE) build GOOS=darwin GOARCH=amd64 diff --git a/cli/README.md.TEMPLATE b/cli/README.md.TEMPLATE index fb79b134b..fee03a253 100644 --- a/cli/README.md.TEMPLATE +++ b/cli/README.md.TEMPLATE @@ -1,31 +1,31 @@ -# Mizu release _SEM_VER_ +# Mizu release _VER_ Full changelog for stable release see in [docs](https://github.com/up9inc/mizu/blob/main/docs/CHANGELOG.md) ## Download Mizu for your platform **Mac** (x86-64/Intel) ``` -curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_darwin_amd64 && chmod 755 mizu +curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_VER_/mizu_darwin_amd64 && chmod 755 mizu ``` **Mac** (AArch64/Apple M1 silicon) ``` -curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_darwin_arm64 && chmod 755 mizu +curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_VER_/mizu_darwin_arm64 && chmod 755 mizu ``` **Linux** (x86-64) ``` -curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_linux_amd64 && chmod 755 mizu +curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_VER_/mizu_linux_amd64 && chmod 755 mizu ``` **Linux** (AArch64) ``` -curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_linux_arm64 && chmod 755 mizu +curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_VER_/mizu_linux_arm64 && chmod 755 mizu ``` **Windows** (x86-64) ``` -curl -LO https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu.exe +curl -LO https://github.com/up9inc/mizu/releases/download/_VER_/mizu.exe ``` ### Checksums diff --git a/cli/apiserver/provider.go b/cli/apiserver/provider.go index 6be4e8105..07afe6803 100644 --- a/cli/apiserver/provider.go +++ b/cli/apiserver/provider.go @@ -143,5 +143,5 @@ func (provider *Provider) GetVersion() (string, error) { return "", err } - return versionResponse.SemVer, nil + return versionResponse.Ver, nil } diff --git a/cli/mizu/version/versionCheck.go b/cli/mizu/version/versionCheck.go index 949361aeb..a084621a3 100644 --- a/cli/mizu/version/versionCheck.go +++ b/cli/mizu/version/versionCheck.go @@ -83,7 +83,7 @@ func CheckNewerVersion(versionChan chan string) { greater, err := version.GreaterThen(gitHubVersion, mizu.Ver) if err != nil { - logger.Log.Debugf("[ERROR] Semver version is not valid, github version %v, current version %v", gitHubVersion, mizu.Ver) + logger.Log.Debugf("[ERROR] Ver version is not valid, github version %v, current version %v", gitHubVersion, mizu.Ver) versionChan <- "" return } diff --git a/devops/build-agent-ci.sh b/devops/build-agent-ci.sh index 430177a9c..1137890a1 100755 --- a/devops/build-agent-ci.sh +++ b/devops/build-agent-ci.sh @@ -7,9 +7,9 @@ SERVER_NAME=mizu GIT_BRANCH=ci DOCKER_REPO=$REPOSITORY/$SERVER_NAME/$GIT_BRANCH -SEM_VER=${SEM_VER=0.0.0} +VER=${VER=0.0} -DOCKER_TAGGED_BUILD="$DOCKER_REPO:$SEM_VER" +DOCKER_TAGGED_BUILD="$DOCKER_REPO:$VER" echo "building $DOCKER_TAGGED_BUILD" -docker build -t ${DOCKER_TAGGED_BUILD} --build-arg SEM_VER=${SEM_VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} . +docker build -t ${DOCKER_TAGGED_BUILD} --build-arg VER=${VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} . diff --git a/devops/build-push-featurebranch.sh b/devops/build-push-featurebranch.sh index 4e040ac69..7723b1618 100755 --- a/devops/build-push-featurebranch.sh +++ b/devops/build-push-featurebranch.sh @@ -7,9 +7,9 @@ SERVER_NAME=mizu GIT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | tr '[:upper:]' '[:lower:]') DOCKER_REPO=$REPOSITORY/$SERVER_NAME/$GIT_BRANCH -SEM_VER=${SEM_VER=0.0.0} +VER=${VER=0.0} -DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$SEM_VER") +DOCKER_TAGGED_BUILDS=("$DOCKER_REPO:latest" "$DOCKER_REPO:$VER") if [ "$GIT_BRANCH" = 'develop' -o "$GIT_BRANCH" = 'master' -o "$GIT_BRANCH" = 'main' ] then @@ -19,7 +19,7 @@ fi echo "building ${DOCKER_TAGGED_BUILDS[@]}" DOCKER_TAGS_ARGS=$(echo ${DOCKER_TAGGED_BUILDS[@]/#/-t }) # "-t FIRST_TAG -t SECOND_TAG ..." -docker build $DOCKER_TAGS_ARGS --build-arg SEM_VER=${SEM_VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} . +docker build $DOCKER_TAGS_ARGS --build-arg VER=${VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} . for DOCKER_TAG in "${DOCKER_TAGGED_BUILDS[@]}" do diff --git a/shared/models.go b/shared/models.go index 4d415aced..9081e9a9e 100644 --- a/shared/models.go +++ b/shared/models.go @@ -135,7 +135,7 @@ type HealthResponse struct { } type VersionResponse struct { - SemVer string `json:"semver"` + Ver string `json:"ver"` } type RulesPolicy struct {