Merge branch 'develop' into trunk

This commit is contained in:
Fergal Moran
2020-09-05 02:29:07 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -17,7 +17,7 @@ jobs:
run: | run: |
DOCKER_IMAGE=fergalmoran/bitchmin-web DOCKER_IMAGE=fergalmoran/bitchmin-web
DOCKER_PLATFORMS=linux/amd64,linux/arm/v7 DOCKER_PLATFORMS=linux/amd64,linux/arm/v7
VERSION=edge VERSION=latest
if [[ $GITHUB_REF == refs/tags/* ]]; then if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF#refs/tags/v} VERSION=${GITHUB_REF#refs/tags/v}

View File

@@ -17,7 +17,7 @@ jobs:
run: | run: |
DOCKER_IMAGE=fergalmoran/bitchmin-api DOCKER_IMAGE=fergalmoran/bitchmin-api
DOCKER_PLATFORMS=linux/amd64,linux/arm/v7 DOCKER_PLATFORMS=linux/amd64,linux/arm/v7
VERSION=edge VERSION=latest
if [[ $GITHUB_REF == refs/tags/* ]]; then if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF#refs/tags/v} VERSION=${GITHUB_REF#refs/tags/v}