Skip to content

Commit

Permalink
updated after discussions
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg-At-Armory committed Sep 19, 2023
1 parent 5162e31 commit 26e4600
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ jobs:
- name: Build and push Docker image
env:
REGISTRY: docker.io
VERSION: ${{ steps.vars.outputs.version }}
VERSION: ${{ needs.setup.outputs.version }}
IMAGE_TAG_VERSION: ${{ steps.vars.outputs.version }}
IMAGE_TAG: latest
PUSH: true
run: make release
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
APP_NAME = armory
APP_EXT ?= "${CLI_EXT}"
VERSION ?= $(shell ./scripts/version.sh | cut -c -30) #limit the version to 30 characters -
VERSION ?= $(shell ./scripts/version.sh | cut -c -30) #limit the version to 30 characters -
IMAGE_TAG_VERSION ?= "${VERSION}"
REGISTRY ?= armory-docker-local.jfrog.io
REGISTRY_ORG ?= armory
GOARCH ?= $(shell go env GOARCH)
Expand Down Expand Up @@ -49,7 +50,7 @@ ifdef PUSH
endif
@docker build \
--tag $(IMAGE):$(IMAGE_TAG) \
--tag $(IMAGE):$(VERSION) \
--tag $(IMAGE):$(IMAGE_TAG_VERSION) \
--label "org.opencontainers.image.created=$(TIMESTAMP)" \
--label "org.opencontainers.image.description=The CLI for Armory Continuous Deployments-as-a-Service" \
--label "org.opencontainers.image.revision=$(GITHUB_SHA)" \
Expand Down
3 changes: 1 addition & 2 deletions cmd/rootCmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"io"
"net/http"
"os"
"strings"
"time"
)

Expand Down Expand Up @@ -180,7 +179,7 @@ func CheckForUpdate(cli *config.Configuration) {
if err != nil {
return
}
if ((!strings.HasSuffix(*currentRelease.TagName, currentVersion)) || (currentVersion == "development")) && cli.GetOutputType() == output.Text {
if ((*currentRelease.TagName != currentVersion) || (currentVersion == "development")) && cli.GetOutputType() == output.Text {
color.Set(color.FgGreen)
console.Stderrf("\nNOTICE: A new version of the Armory CLI is available. Please upgrade to %s by running `brew upgrade armory-cli` if installed with Homebrew or by running `avm install` if installed with AVM.\n\n", *currentRelease.TagName)
color.Unset()
Expand Down

0 comments on commit 26e4600

Please sign in to comment.