diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 19d541c..74698db 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -5,7 +5,7 @@ on: - cron: "37 20 * * *" push: branches: - - master + - main pull_request: permissions: @@ -78,7 +78,7 @@ jobs: - name: Docker Buildx (build) uses: docker/build-push-action@v7.4.0 - if: success() && !contains(github.ref, 'master') + if: success() && github.ref_name != 'main' with: push: false context: ./${{ matrix.java-version }}/${{ matrix.java-type }}/${{ matrix.node-version }}${{ matrix.variant == 'alpine' && '/alpine' || '' }} @@ -88,7 +88,7 @@ jobs: tags: ${{ steps.prepare.outputs.tags }} - name: Docker Login - if: success() && github.event_name != 'pull_request' && contains(github.ref, 'master') + if: success() && github.event_name != 'pull_request' && github.ref_name == 'main' uses: docker/login-action@v4.6.0 with: username: ${{ secrets.DOCKER_USERNAME }} @@ -96,7 +96,7 @@ jobs: - name: Docker Buildx (push) uses: docker/build-push-action@v7.4.0 - if: success() && github.event_name != 'pull_request' && contains(github.ref, 'master') + if: success() && github.event_name != 'pull_request' && github.ref_name == 'main' with: push: true context: ./${{ matrix.java-version }}/${{ matrix.java-type }}/${{ matrix.node-version }}${{ matrix.variant == 'alpine' && '/alpine' || '' }} @@ -106,7 +106,7 @@ jobs: tags: ${{ steps.prepare.outputs.tags }} - name: Inspect Image - if: always() && github.event_name != 'pull_request' && contains(github.ref, 'master') + if: always() && github.event_name != 'pull_request' && github.ref_name == 'main' run: | docker buildx imagetools inspect $(echo "${{ steps.prepare.outputs.tags }}" | cut -d',' -f1) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index ee807e3..95447f8 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -3,7 +3,7 @@ name: Test Docker image on: push: branches: - - master + - main pull_request: workflow_dispatch: diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index 6b682b3..e75a39e 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -3,7 +3,7 @@ name: Lint Dockerfiles on: push: branches: - - master + - main pull_request: permissions: