Remove non POSIX sed usage (#855)
`sed -r` is not compatible with POSIX. Replace it by `sed -E` which is supported by either GNU sed or BSD sed
This commit is contained in:
parent
73e0bbaf93
commit
6a08e4ed7f
|
@ -21,7 +21,7 @@ jobs:
|
||||||
if [[ $GITHUB_REF == refs/tags/* ]]; then
|
if [[ $GITHUB_REF == refs/tags/* ]]; then
|
||||||
VERSION=${GITHUB_REF#refs/tags/}
|
VERSION=${GITHUB_REF#refs/tags/}
|
||||||
elif [[ $GITHUB_REF == refs/heads/* ]]; then
|
elif [[ $GITHUB_REF == refs/heads/* ]]; then
|
||||||
VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
|
VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -E 's#/+#-#g')
|
||||||
elif [[ $GITHUB_REF == refs/pull/* ]]; then
|
elif [[ $GITHUB_REF == refs/pull/* ]]; then
|
||||||
VERSION=pr-${{ github.event.number }}
|
VERSION=pr-${{ github.event.number }}
|
||||||
fi
|
fi
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -29,7 +29,7 @@ MINIMUM_SUPPORTED_GO_MINOR_VERSION = 13
|
||||||
GO_VERSION_VALIDATION_ERR_MSG = Golang version ($(BUILD_GOVERSION)) is not supported, please use least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION)
|
GO_VERSION_VALIDATION_ERR_MSG = Golang version ($(BUILD_GOVERSION)) is not supported, please use least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION)
|
||||||
#Current versioning information from env
|
#Current versioning information from env
|
||||||
BUILD_VERSION?="$(shell git describe --tags `git rev-list --tags --max-count=1`)"
|
BUILD_VERSION?="$(shell git describe --tags `git rev-list --tags --max-count=1`)"
|
||||||
BUILD_GOVERSION="$(shell go version | cut -d " " -f3 | sed -r 's/[go]+//g')"
|
BUILD_GOVERSION="$(shell go version | cut -d " " -f3 | sed -E 's/[go]+//g')"
|
||||||
BUILD_CODENAME=$(shell cat RELEASE.json | jq -r .CodeName)
|
BUILD_CODENAME=$(shell cat RELEASE.json | jq -r .CodeName)
|
||||||
BUILD_TIMESTAMP=$(shell date +%F"_"%T)
|
BUILD_TIMESTAMP=$(shell date +%F"_"%T)
|
||||||
BUILD_TAG="$(shell git rev-parse HEAD)"
|
BUILD_TAG="$(shell git rev-parse HEAD)"
|
||||||
|
|
Loading…
Reference in a new issue