From 6c49f3b4ff52996506d6b95f83cab122b7e7bf60 Mon Sep 17 00:00:00 2001 From: Christo du Toit Date: Mon, 20 May 2024 22:31:12 +0100 Subject: [PATCH 1/3] INFRA: Updated the build script to use main as default branch post repo migration --- .github/workflows/dotnet.yml | 6 +++--- ADotNet.Infrastructure.Build/Program.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 94cfa8f..f1e7cfc 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: >- ${{ @@ -114,7 +114,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 From 4320455896e54133e203c1e2bfde1fdd7da624b2 Mon Sep 17 00:00:00 2001 From: Christo du Toit Date: Mon, 20 May 2024 23:44:40 +0100 Subject: [PATCH 2/3] CODE RUB: Updated build script --- .github/workflows/dotnet.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f1e7cfc..6c3cd3d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -35,7 +35,6 @@ jobs: with: 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); From 5b8d639c61e8f79f21c6ae156a35f8ad9dd24c00 Mon Sep 17 00:00:00 2001 From: Christo du Toit Date: Tue, 21 May 2024 22:09:42 +0100 Subject: [PATCH 3/3] CODE RUB: Fixed syntax --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 21412aa..6c3cd3d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -33,7 +33,7 @@ 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:',