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 #49 from localheinz/fix/tag
Browse files Browse the repository at this point in the history
Fix: Actually push tagged Docker image when GitHub tag is created
  • Loading branch information
localheinz authored Sep 20, 2019
2 parents 907aea7 + 6f5ec60 commit a206820
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
run: $(which docker) run --interactive --rm --workdir=/normalizer --volume ${GITHUB_WORKSPACE}/.build:/normalizer localheinz/composer-normalize-action:latest --indent-size=1 --indent-style=tab --no-update-lock

- name: "Docker Login"
if: "'refs/heads/master' == github.ref || startsWith('refs/tags/', github.ref)"
if: "'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/')"
run: echo ${{ secrets.DOCKER_PASSWORD }} | $(which docker) login --password-stdin --username ${{ secrets.DOCKER_USERNAME }}

- name: "Push Docker image (latest)"
if: "'refs/heads/master' == github.ref || startsWith('refs/tags/', github.ref)"
if: "'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/')"
run: $(which docker) push localheinz/composer-normalize-action:latest

- name: "Push Docker image (versioned)"
if: "startsWith('refs/tags/', github.ref)"
if: "startsWith(github.ref, 'refs/tags/')"
run: $(which docker) push localheinz/composer-normalize-action:$(bash ./.build/tag-name.sh ${GITHUB_REF})

- name: "Docker Logout"
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`0.5.0...master`](https://github.com/localheinz/composer-normalize-action/compare/0.5.0...master).
For a full diff see [`0.5.1...master`](https://github.com/localheinz/composer-normalize-action/compare/0.5.1...master).

## [`0.5.1`](https://github.com/localheinz/composer-normalize-action/releases/tag/0.5.1)

For a full diff see [`0.5.0...0.5.1`](https://github.com/localheinz/composer-normalize-action/compare/0.5.0...0.5.1).

### Fixed

* Flipped arguments passed to `startsWith()` so Docker images are actually tagged when a tag is created on GitHub ([#49](https://github.com/localheinz/composer-normalize-action/pull/49)), by [@localheinz](https://github.com/localheinz)

## [`0.5.0`](https://github.com/localheinz/composer-normalize-action/releases/tag/0.5.0)

For a full diff see [`0.4.2...0.5.0`](https://github.com/localheinz/composer-normalize-action/compare/0.4.2...0.5.0).


### Changed

* Started using `php:7.3-cli-alpine` instead of `php:7.3-alpine` as Docker base image ([#39](https://github.com/localheinz/composer-normalize-action/pull/39)), by [@localheinz](https://github.com/localheinz)
Expand Down

0 comments on commit a206820

Please sign in to comment.