Skip to content

Commit

Permalink
Rename primary branch from develop to main
Browse files Browse the repository at this point in the history
Update the various pipelines to use main as the primary branch.
Simplify and remove staging build tags

Ref LINK-1438
  • Loading branch information
voneiden committed Aug 17, 2023
1 parent db73719 commit f2cd2e4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: linkedevents-ci

on:
push:
branches: [master, develop]
branches: [main]
pull_request:
branches: [master, develop]
branches: [main]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
5 changes: 1 addition & 4 deletions azure-pipelines-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ trigger:
batch: true
branches:
include:
- develop
- refs/tags/staging-*
- main
- refs/tags/release-*
paths:
exclude:
Expand All @@ -27,7 +26,5 @@ extends:
parameters:
${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/release-') }}:
buildenv: -prod
${{ elseif startsWith(variables['Build.SourceBranch'], 'refs/tags/staging-') }}:
buildenv: -staging
${{ else }}:
buildenv: -dev
3 changes: 1 addition & 2 deletions azure-pipelines-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ parameters:
default: "-dev"
values:
- "-prod"
- "-staging"
- "-dev"

resources:
Expand All @@ -26,7 +25,7 @@ resources:
trigger:
branches:
include:
- refs/heads/develop
- refs/heads/main

extends:
template: azure-pipelines-deploy-linkedevents-api-dev.yml@linkedevents-pipelines
5 changes: 2 additions & 3 deletions azure-pipelines-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ parameters:
- name: buildenv
displayName: Build environment
type: string
default: "-staging"
default: "-prod"
values:
- "-dev"
- "-prod"
- "-staging"


resources:
repositories:
Expand Down
5 changes: 2 additions & 3 deletions azure-pipelines-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ parameters:
- name: buildenv
displayName: Build environment
type: string
default: "-test"
default: "-dev"
values:
- "-prod"
- "-staging"
- "-dev"
- "-prod"

resources:
repositories:
Expand Down

0 comments on commit f2cd2e4

Please sign in to comment.