From 7697d03323b731453fff2211ce1c154c36b9bf09 Mon Sep 17 00:00:00 2001 From: Darragh Bailey Date: Thu, 3 Nov 2022 15:58:09 +0000 Subject: [PATCH] Ensure reusable workflow reference correctly (#1654) Reference the main branch for where to find the reusable workflow. Additionally make sure that login to docker hub is only for push to main and tags. --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 62fbf4c..4e119a5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -35,11 +35,11 @@ jobs: run: buildah bud . generate-docker-metadata: - uses: vagrant-libvirt/vagrant-libvirt/.github/workflows/docker-meta.yml@publish-pr-docker-image + uses: vagrant-libvirt/vagrant-libvirt/.github/workflows/docker-meta.yml@main secrets: inherit generate-docker-metadata-slim: - uses: vagrant-libvirt/vagrant-libvirt/.github/workflows/docker-meta.yml@publish-pr-docker-image + uses: vagrant-libvirt/vagrant-libvirt/.github/workflows/docker-meta.yml@main with: flavor: | suffix=-slim @@ -90,7 +90,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Login to DockerHub - if: steps.docker_io_publish.outputs.enable == 'true' + if: ${{ ! (startsWith(github.event_name, 'pull_request') }} uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }}