From 532edf7b7a7186e3b2c9693b511a9a29b0640bdf Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 17 Jul 2024 09:53:45 +0100 Subject: [PATCH 1/6] feat(main.yml): add output log for choco push command to improve debugging fix(main.yml): correct choco push command syntax for proper execution --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 80a699ca6..6281f3c2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -353,8 +353,8 @@ jobs: } else { Write-Output $"Running with {$chocoFile}" } - - choco push "$chocoFile" --version $NuGetVersion --key ${{ secrets.CHOCO_APIKEY }} --source https://push.chocolatey.org/ + Write-Output 'choco push "$chocoFile" --key "${{ secrets.CHOCO_APIKEY }}" --source "https://push.chocolatey.org/"' + choco push "$chocoFile" --key "${{ secrets.CHOCO_APIKEY }}" --source "https://push.chocolatey.org/" # Release to Winget From 0136b776cbbe50f49fbf354dbd71c5e12f7c28bb Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 17 Jul 2024 10:09:36 +0100 Subject: [PATCH 2/6] fix(main.yml): modify branch pattern in GitHub Actions workflow to include nested branches This change allows the workflow to run on pushes to all branches, including those in subdirectories. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6281f3c2a..d852cdd00 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ permissions: on: push: - branches: ["*"] + branches: ["**"] tags-ignore: ["v*-*"] pull_request: From f56dd84864e1c6b65c36a85306661bbbaf31dd9b Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 17 Jul 2024 10:14:22 +0100 Subject: [PATCH 3/6] fix(main.yml): remove pull_request trigger from GitHub Actions workflow to prevent unnecessary runs on pull requests to main branch --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d852cdd00..ae55ca79f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,8 +9,6 @@ on: branches: ["**"] tags-ignore: ["v*-*"] - pull_request: - branches: [ "main" ] workflow_dispatch: concurrency: From ffe1ae994520d0844849d5f0eea8764538d6077b Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 17 Jul 2024 10:27:20 +0100 Subject: [PATCH 4/6] feat(main.yml): add pull_request event to GitHub Actions workflow to run CI checks on PRs targeting main branch --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ae55ca79f..8a1a8d8c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,8 @@ on: push: branches: ["**"] tags-ignore: ["v*-*"] - + pull_request: + branches: ["main"] workflow_dispatch: concurrency: From 7cbd4021faaa77867596000958a6e156a46f51af Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 17 Jul 2024 10:30:09 +0100 Subject: [PATCH 5/6] Refoce checks after disabling OpenCommit as it interfeers with builds... --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a1a8d8c5..a793e8b0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true defaults: From 9f07b65e1a6ee404110c953a42dce0decb3297ed Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 17 Jul 2024 10:34:52 +0100 Subject: [PATCH 6/6] ci(main.yml): restrict push triggers to main branch only to prevent unnecessary workflow runs on other branches --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a793e8b0a..eb71a8e9e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ permissions: on: push: - branches: ["**"] + branches: ["main"] tags-ignore: ["v*-*"] pull_request: branches: ["main"]