From eeff6cf307c449d18eb17dc5769f3f76ea9a2916 Mon Sep 17 00:00:00 2001 From: Steve Wagner Date: Wed, 10 May 2023 09:30:17 -0700 Subject: [PATCH] Tweaking trigger --- .github/workflows/build-and-sign-image.yml | 5 +---- .github/workflows/go.yml | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build-and-sign-image.yml b/.github/workflows/build-and-sign-image.yml index ab32b5f3..d06319a4 100644 --- a/.github/workflows/build-and-sign-image.yml +++ b/.github/workflows/build-and-sign-image.yml @@ -9,16 +9,13 @@ on: branches: - "main" -# push: -# branches: -# - "trigger-image-build-and-push-1" - env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} jobs: build_and_sign_image: + if: ${{ github.event.pull_request.merged }} runs-on: ubuntu-latest permissions: contents: read diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index ddfa654a..32bd8bc6 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -6,8 +6,6 @@ name: Go on: push: branches: [ "main", "*" ] - pull_request: - branches: [ "main" ] jobs: