Skip to content

Commit 95c16de

Browse files
committed
[fix] new tag dev6
keep :latest and :release tags aligned add dev:6 tag for snapshots from develop-6.x.x see #3953
1 parent 944ff2d commit 95c16de

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

.github/workflows/ci-deploy.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
# NOTE (DP): Publish on develop and master, test on PRs against these
88
# TODO(DP) Reinstate CRONed release builds to update stock apps regularly
9-
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/develop-6.x.x' || github.base_ref == 'develop' || github.base_ref == 'develop-6.x.x'
9+
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/develop-6.x.x' || github.ref == 'refs/heads/master'|| github.base_ref == 'develop' || github.base_ref == 'develop-6.x.x' || github.base_ref == 'master'
1010
steps:
1111
- uses: actions/checkout@v4
1212
with:
@@ -56,8 +56,16 @@ jobs:
5656
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
5757
run: mvn -q -Ddocker.tag=latest -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
5858
working-directory: ./exist-docker
59-
- name: Publish release images
59+
- name: Publish dev6 images
6060
if: github.ref == 'refs/heads/develop-6.x.x'
61+
env:
62+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
64+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
65+
run: mvn -q -Ddocker.tag=dev6 -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
66+
working-directory: ./exist-docker
67+
- name: Publish release images
68+
if: github.ref == 'refs/heads/master'
6169
env:
6270
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6371
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}

0 commit comments

Comments
 (0)