Skip to content

Commit

Permalink
Merge pull request #108 from The-Standard-Organization/users/cjdutoit…
Browse files Browse the repository at this point in the history
…/infra-build-script

INFRA:  Updated the build script to use main as default branch
  • Loading branch information
cjdutoit authored May 21, 2024
2 parents 4adf842 + 5b8d639 commit 8285c5c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: .Net
on:
push:
branches:
- master
- main
pull_request:
types:
- opened
- synchronize
- reopened
- closed
branches:
- master
- main
env:
IS_RELEASE_CANDIDATE: >-
${{
Expand All @@ -33,9 +33,8 @@ jobs:
- name: Apply Label
uses: actions/github-script@v6
with:
token: ${{ secrets.PAT_FOR_TAGGING }}
github-token: ${{ secrets.PAT_FOR_TAGGING }}
script: >2+
const prefixes = [
'INFRA:',
'PROVISIONS:',
Expand Down Expand Up @@ -68,13 +67,8 @@ jobs:
'DESIGN:',
'BUSINESS:'
];
const title = context.payload.pull_request.title;
const existingLabels = context.payload.pull_request.labels.map(label => label.name);
for (const prefix of prefixes) {
if (title.startsWith(prefix)) {
const label = prefix.slice(0, -1);
Expand Down Expand Up @@ -114,7 +108,7 @@ jobs:
github.event.pull_request.merged &&
github.event.pull_request.base.ref == 'master' &&
github.event.pull_request.base.ref == 'main' &&
startsWith(github.event.pull_request.title, 'RELEASES:') &&
Expand Down
2 changes: 1 addition & 1 deletion ADotNet.Infrastructure.Build/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal class Program
{
static void Main(string[] args)
{
string branchName = "master";
string branchName = "main";
var aDotNetClient = new ADotNetClient();

var githubPipeline = new GithubPipeline
Expand Down

0 comments on commit 8285c5c

Please sign in to comment.