Skip to content

Commit

Permalink
Merge pull request #102 from Axway/APIGOV-00000
Browse files Browse the repository at this point in the history
APIGOV-00000 - fix regex
  • Loading branch information
dfeldick authored May 10, 2024
2 parents 885c9c2 + f170188 commit 7959adc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/fully-automated-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)}')
Expand All @@ -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
Expand All @@ -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:
Expand Down

0 comments on commit 7959adc

Please sign in to comment.