Skip to content

Commit

Permalink
Merge pull request #165 from arup-group/switch-to-main
Browse files Browse the repository at this point in the history
Update build-test-deploy.yml
  • Loading branch information
kpne authored Sep 26, 2022
2 parents 2d35046 + 62e4ddb commit f4c717a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# https://aka.ms/yaml

trigger:
- master
- main

variables:
- group: s3PushInstallers
Expand Down Expand Up @@ -125,7 +125,7 @@ steps:
$yakRh7Name = $yakCurrentVersName -Replace "rh6_27", "rh7_0"
Rename-Item -Path $yakCurrentVersName -NewName $yakRh7Name
..\yak build --platform win
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'), ne(variables.TAG_EXISTS, 'true'))
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'), ne(variables.TAG_EXISTS, 'true'))
displayName: Package yak

- task: NuGetCommand@2
Expand All @@ -134,7 +134,7 @@ steps:
packagesToPack: 'GsaGH/*.csproj'
versioningScheme: 'byEnvVar'
versionEnvVar: 'dotSeparatedTag'
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'), ne(variables.TAG_EXISTS, 'true'))
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'), ne(variables.TAG_EXISTS, 'true'))
displayName: Package NuGet

- task: GitHubRelease@1
Expand All @@ -156,7 +156,7 @@ steps:
isDraft: true
isPreRelease: true
addChangeLog: false
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'), ne(variables.TAG_EXISTS, 'true'))
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'), ne(variables.TAG_EXISTS, 'true'))
displayName: 'Publishing assets to Github'

- powershell: |
Expand Down

0 comments on commit f4c717a

Please sign in to comment.