From e92d497d4c6b8cfa5339dd1f67c78e33548481b8 Mon Sep 17 00:00:00 2001 From: John Simons Date: Wed, 2 Mar 2022 15:12:08 +1000 Subject: [PATCH] Update workflow to main --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fcad1126f..59ef54a7b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,10 +2,10 @@ name: Build, test and publish on: push: - branches: [ master ] + branches: [ main ] tags: [ '*' ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: @@ -166,4 +166,4 @@ jobs: tar -xf OctopusTools.$VERSION.linux-x64.tar.gz zip OctopusTools.Zips.$VERSION.zip *.zip *.tar.gz ./octo push --space "Integrations" --package Octopus.Cli.$VERSION.nupkg --package Octopus.DotNet.Cli.$VERSION.nupkg --package OctopusTools.$VERSION.nupkg --package Octo.Docker.Image.$VERSION.tar.gz --package OctopusTools.Packages.linux-x64.$VERSION.zip --package OctopusTools.Zips.$VERSION.zip --overwrite-mode OverwriteExisting - ./octo create-release --space "Integrations" --project "Octopus CLI" --packageVersion "$VERSION" --package "*:NuGet.CommandLine:4.4.1" --gitRef "${{ github.head_ref || github.ref }}" --gitCommit "${{ github.event.after || github.event.pull_request.head.sha }}" + ./octo create-release --space "Integrations" --project "Octopus CLI" --packageVersion "$VERSION" --package "*:NuGet.CommandLine:4.4.1" --gitRef "${{ (github.ref_type == 'tag' && 'main' ) || (github.head_ref || github.ref) }}" --gitCommit "${{ github.event.after || github.event.pull_request.head.sha }}"