From 8b451a344b65388129fddb00db2a307db7082bc0 Mon Sep 17 00:00:00 2001 From: Bill Church Date: Sat, 30 Jul 2022 18:45:02 +0000 Subject: [PATCH] chore: update workflow --- .github/workflows/action-test.yml | 3 +-- .github/workflows/docker-multiplatform.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/action-test.yml b/.github/workflows/action-test.yml index e73d1fd..f73c661 100644 --- a/.github/workflows/action-test.yml +++ b/.github/workflows/action-test.yml @@ -22,11 +22,10 @@ jobs: run: | DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/} VERSION=latest - SHORTREF=$(git rev-parse --short=8 ${{ inputs.tag }}) VERSION=${{ inputs.tag }} VERSION="${VERSION//v}" - TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}" + TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}" # If the VERSION looks like a version number, assume that # this is the most recent version of the image and also diff --git a/.github/workflows/docker-multiplatform.yml b/.github/workflows/docker-multiplatform.yml index 7704290..0b0f3b5 100644 --- a/.github/workflows/docker-multiplatform.yml +++ b/.github/workflows/docker-multiplatform.yml @@ -19,13 +19,12 @@ jobs: run: | DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/} VERSION=main - SHORTREF=${GITHUB_SHA::8} # If this is git tag, use the tag name as a docker tag if [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} fi - TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}" + TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}" # If the VERSION looks like a version number, assume that # this is the most recent version of the image and also # tag it 'latest'.