diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 7da4553..6c3cd3d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,7 +2,7 @@ name: .Net on: push: branches: - - master + - main pull_request: types: - opened @@ -10,7 +10,7 @@ on: - reopened - closed branches: - - master + - main env: IS_RELEASE_CANDIDATE: >- ${{ @@ -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:', @@ -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); @@ -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:') && diff --git a/ADotNet.Infrastructure.Build/Program.cs b/ADotNet.Infrastructure.Build/Program.cs index 3c1aac6..6e169fc 100644 --- a/ADotNet.Infrastructure.Build/Program.cs +++ b/ADotNet.Infrastructure.Build/Program.cs @@ -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