Skip to content
This repository has been archived by the owner on Mar 6, 2021. It is now read-only.

Commit

Permalink
Merge pull request #50 from localheinz/fix/tag
Browse files Browse the repository at this point in the history
Fix: Actually tag Docker image before attempting to push it
  • Loading branch information
localheinz authored Sep 20, 2019
2 parents a206820 + 0b6e629 commit 0480f68
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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})
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 0480f68

Please sign in to comment.