From db75ec76746e34c431727ccadf04bfcbc34b85de Mon Sep 17 00:00:00 2001 From: Cameron Motevasselani Date: Fri, 8 Apr 2022 19:00:53 -0700 Subject: [PATCH] =?UTF-8?q?chore(dependencies):=20don't=20create=20an=20au?= =?UTF-8?q?tobump=20PR=20for=20halyard=20on=20a=20fia=E2=80=A6=20(#938)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cameron Motevasselani (cherry picked from commit 3cf72545ef6ef24435b2c2248db39d870b84cad8) # Conflicts: # .github/workflows/bump_dependencies.yml --- .github/workflows/bump_dependencies.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/bump_dependencies.yml b/.github/workflows/bump_dependencies.yml index 65baa7b16..f3778189f 100644 --- a/.github/workflows/bump_dependencies.yml +++ b/.github/workflows/bump_dependencies.yml @@ -14,6 +14,13 @@ jobs: ref: ${{ github.event.client_payload.ref }} baseBranch: ${{ github.event.client_payload.branch }} key: fiatVersion +<<<<<<< HEAD repositories: clouddriver,echo,front50,gate,halyard,igor,keel,orca +======= + repositories: clouddriver,echo,front50,gate,igor,keel,orca + mavenRepositoryUrl: https://repo.maven.apache.org/maven2 + groupId: io.spinnaker.fiat + artifactId: fiat-bom +>>>>>>> 3cf7254 (chore(dependencies): don't create an autobump PR for halyard on a fia… (#938)) env: GITHUB_OAUTH: ${{ secrets.SPINNAKER_GITHUB_TOKEN }}