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 861f1f8..20bb959 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ WORKSPACE ?= $$(pwd) GO_PKG_LIST := $(shell go list ./...) SDK_VERSION := $(shell go list -m github.com/Axway/agent-sdk | cut -d ' ' -f 2 | cut -c 2-) -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) COMMIT_ID := $(shell git rev-parse --short HEAD) export GOFLAGS := -mod=mod @@ -35,7 +35,7 @@ dep-branch: dep-version: @export version=$(sdk) && make update-sdk && make dep -dep-sdk: +dep-sdk: @make sdk=main dep-version test: dep