Fix conflicts
This commit is contained in:
commit
7d8b40c607
8
.github/workflows/main-build.yml
vendored
8
.github/workflows/main-build.yml
vendored
@ -57,9 +57,15 @@ jobs:
|
||||
if [ "${{ matrix.branch }}" = "develop" ]; then
|
||||
PRODUCT_VERSION="develop"
|
||||
DOCKER_TAG=${PRODUCT_VERSION}.${{ github.run_number }}
|
||||
<<<<<<< HEAD
|
||||
else
|
||||
PRODUCT_VERSION=$(echo "${{ matrix.branch }}" | sed '/^release\b\|^hotfix\b\|^feature\b/s/release.*\/\|hotfix.*\/\|feature.*\///; s/-git-action$//; s/^v//')
|
||||
DOCKER_TAG=${PRODUCT_VERSION}.${{github.run_number}}
|
||||
=======
|
||||
else
|
||||
PRODUCT_VERSION=$(echo "${{ matrix.branch }}" | sed '/^release\b\|^hotfix\b\|^feature\b/s/release.*\/\|hotfix.*\/\|feature.*\///; s/-git-action$//; s/^v//')
|
||||
DOCKER_TAG=${PRODUCT_VERSION}.${{github.run_number}}
|
||||
>>>>>>> master
|
||||
fi
|
||||
export DOCKER_TAG
|
||||
docker buildx bake -f build.yml \
|
||||
@ -67,6 +73,8 @@ jobs:
|
||||
--set *.args.PRODUCT_VERSION=${PRODUCT_VERSION} \
|
||||
--set *.args.BUILD_NUMBER=${BUILD_NUMBER} \
|
||||
--set *.platform=linux/amd64 \
|
||||
--set *.args.PRODUCT_VERSION=${PRODUCT_VERSION} \
|
||||
--set *.args.BUILD_NUMBER=${BUILD_NUMBER} \
|
||||
--push
|
||||
|
||||
echo "version=${DOCKER_TAG}" >> "$GITHUB_OUTPUT"
|
||||
|
Loading…
Reference in New Issue
Block a user