diff --git a/.github/workflows/fully-automated-release.yml b/.github/workflows/fully-automated-release.yml index 10d65e6..da51666 100644 --- a/.github/workflows/fully-automated-release.yml +++ b/.github/workflows/fully-automated-release.yml @@ -22,7 +22,7 @@ jobs: - name: Get latest SDK version run: | - export LATEST_REMOTE_TAG_CMD="git ls-remote --tags --refs --sort='version:refname' REMOTE_REPO | grep -Eo 'v?[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,3}$' | tail -1" + export LATEST_REMOTE_TAG_CMD="git ls-remote --tags --refs --sort='version:refname' REMOTE_REPO | grep -Eo 'v?[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$' | tail -1" REMOTE_REPO_PATH="https://github.com/Axway/agent-sdk" CMD=${LATEST_REMOTE_TAG_CMD/"REMOTE_REPO"/${REMOTE_REPO_PATH}} export SDK_VERSION=$(eval $CMD) @@ -42,7 +42,7 @@ jobs: title: 'APIGOV-UpdateSDK - Update to SDK ${{ env.SDK_VERSION }}' delete-branch: true reviewers: dfeldick - + - name: Enable Pull Request Automerge run: gh pr merge APIGOV-UpdateSDK --admin --merge --subject "Merge branch APIGOV-UpdateSDK" env: diff --git a/Makefile b/Makefile index b8b6d78..d21c17d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ WORKSPACE ?= $$(pwd) GO_PKG_LIST := $(shell go list ./... | grep -v /mock) PROJECT_NAME := agents-kong TIME := $(shell date +%Y%m%d%H%M%S) -VERSION := $(shell git tag -l --sort='version:refname' | grep -Eo '[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,3}$$' | tail -1) +VERSION := $(shell git tag -l --sort='version:refname' | grep -Eo '[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$$' | tail -1) CGO_ENABLED := 0 COMMIT_ID := $(shell git rev-parse --short HEAD) SDK_VERSION := $(shell go list -m github.com/Axway/agent-sdk | awk '{print $$2}' | awk -F'-' '{print substr($$1, 2)}') @@ -23,7 +23,7 @@ test: dep test-s: dep @go vet ${GO_PKG_LIST} @go test -race -short -coverprofile=${WORKSPACE}/gocoverage.out -count=1 ${GO_PKG_LIST} - + clean: @rm -rf ./bin/ @mkdir -p ./bin @@ -43,7 +43,7 @@ dep-version: @echo "$(sdk)" @export version=$(sdk) && make update-sdk && make dep -dep-sdk: +dep-sdk: @make sdk=main dep-version update-sdk: