From 0b6e629addd99c7e0b0ea04097126fc5ee5e72d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 20 Sep 2019 16:24:08 +0200 Subject: [PATCH] Fix: Actually tag Docker image before attempting to push it --- .github/workflows/continuous-integration.yml | 6 +++++- CHANGELOG.md | 10 +++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7b499fb..4762eea 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -16,7 +16,7 @@ jobs: - name: "Checkout" uses: actions/checkout@master - - name: "Build and tag Docker image" + - name: "Build Docker image" run: $(which docker) build --tag localheinz/composer-normalize-action ${GITHUB_WORKSPACE} - name: "Run Docker image with default behaviour" @@ -33,6 +33,10 @@ jobs: if: "'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/')" run: $(which docker) push localheinz/composer-normalize-action:latest + - name: "Tag Docker image (versioned)" + if: "startsWith(github.ref, 'refs/tags/')" + run: $(which docker) tag localheinz/composer-normalize-action localheinz/composer-normalize-action:$(bash ./.build/tag-name.sh ${GITHUB_REF}) + - name: "Push Docker image (versioned)" if: "startsWith(github.ref, 'refs/tags/')" run: $(which docker) push localheinz/composer-normalize-action:$(bash ./.build/tag-name.sh ${GITHUB_REF}) diff --git a/CHANGELOG.md b/CHANGELOG.md index e56573f..d59ea9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased -For a full diff see [`0.5.1...master`](https://github.com/localheinz/composer-normalize-action/compare/0.5.1...master). +For a full diff see [`0.5.2...master`](https://github.com/localheinz/composer-normalize-action/compare/0.5.2...master). + +## [`0.5.2`](https://github.com/localheinz/composer-normalize-action/releases/tag/0.5.2) + +For a full diff see [`0.5.1...0.5.2`](https://github.com/localheinz/composer-normalize-action/compare/0.5.1...0.5.2). + +### Fixed + +* Actually tag Docker image before attempting to push it ([#50](https://github.com/localheinz/composer-normalize-action/pull/50)), by [@localheinz](https://github.com/localheinz) ## [`0.5.1`](https://github.com/localheinz/composer-normalize-action/releases/tag/0.5.1)