diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml index 16054e8ea72..9a857df5ac0 100644 --- a/.github/workflows/ci-deploy.yml +++ b/.github/workflows/ci-deploy.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest # NOTE (DP): Publish on develop and master, test on PRs against these # TODO(DP) Reinstate CRONed release builds to update stock apps regularly - 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' + 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' steps: - uses: actions/checkout@v4 with: @@ -56,8 +56,16 @@ jobs: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} run: mvn -q -Ddocker.tag=latest -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push working-directory: ./exist-docker - - name: Publish release images + - name: Publish dev6 images if: github.ref == 'refs/heads/develop-6.x.x' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + run: mvn -q -Ddocker.tag=dev6 -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push + working-directory: ./exist-docker + - name: Publish release images + if: github.ref == 'refs/heads/master' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}