From 75835ccd4a1b88ab3df6ad0ef14c0812151439fd Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 17 Aug 2023 00:17:07 +0200 Subject: [PATCH 1/5] Try and follow more dotnet versions (#2556) --- scripts/azure-pipelines-complete.yml | 4 ++-- scripts/azure-pipelines.yml | 4 ++-- scripts/azure-templates-stages.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index c0ae30075df..2438a7c6392 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -1,12 +1,12 @@ trigger: - main - develop - - patch/* + - release/* pr: - main - develop - - patch/* + - release/* parameters: - name: buildExternals diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 3e0db24a0bc..059d497f4b9 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -1,12 +1,12 @@ trigger: - main - develop - - patch/* + - release/* pr: - main - develop - - patch/* + - release/* parameters: - name: buildExternals diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml index 0c78c394937..4e87587d83b 100644 --- a/scripts/azure-templates-stages.yml +++ b/scripts/azure-templates-stages.yml @@ -457,9 +457,9 @@ stages: jobs: - template: sign-artifacts/jobs/v2.yml@xamarin-templates parameters: - ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/')) }}: + ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) }}: signType: 'Real' - ${{ if not(or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/'))) }}: + ${{ if not(or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}: signType: 'Test' - ${{ if and(eq(variables['System.TeamProject'], 'devdiv'), ne(parameters.buildPipelineType, 'tests'), ne(variables['System.PullRequest.IsFork'], 'true')) }}: @@ -821,7 +821,7 @@ stages: name: native_checks_windows displayName: Run Code Checks buildPipelineType: ${{ parameters.buildPipelineType }} - condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/')) + condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} target: git-sync-deps installAndroidSdk: false From 683cbe5a05da46299590295554f0268d33f4db8f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 17 Aug 2023 06:38:47 +0800 Subject: [PATCH 2/5] Create Backport GitHub Action --- .github/workflows/backport.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/backport.yml diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml new file mode 100644 index 00000000000..f97bdf2da29 --- /dev/null +++ b/.github/workflows/backport.yml @@ -0,0 +1,33 @@ +name: Backport + +on: + pull_request_target: + types: + - closed + - labeled + +jobs: + backport: + name: Backport + runs-on: ubuntu-latest + # Only react to merged PRs for security reasons. + # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target. + if: > + github.event.pull_request.merged + && ( + github.event.action == 'closed' + || ( + github.event.action == 'labeled' + && contains(github.event.label.name, 'backport') + ) + ) + steps: + - uses: tibdex/backport@v2 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + body_template: > + Backport of <%= mergeCommitSha %> from #<%= number %>. + head_template: "backport/pr-<%= number %>-to-<%= base %>" + label_pattern: "^backport/(?([^ ]+))$" + labels_template: "[ backport ]" + title_template: "[<%= base %>] <%= title %>" From 292c784456e31040cb4b978c334279cacee91b5f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 17 Aug 2023 06:42:07 +0800 Subject: [PATCH 3/5] Use correct JSON for the GitHub Action --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index f97bdf2da29..a3ce284daa3 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -29,5 +29,5 @@ jobs: Backport of <%= mergeCommitSha %> from #<%= number %>. head_template: "backport/pr-<%= number %>-to-<%= base %>" label_pattern: "^backport/(?([^ ]+))$" - labels_template: "[ backport ]" + labels_template: "[ 'backport' ]" title_template: "[<%= base %>] <%= title %>" From a07e19428baa1511814aa0fb41aeff8da1a1e3ec Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 17 Aug 2023 06:46:31 +0800 Subject: [PATCH 4/5] Try another fix for the JSON --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index a3ce284daa3..e5e5ed67fde 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -29,5 +29,5 @@ jobs: Backport of <%= mergeCommitSha %> from #<%= number %>. head_template: "backport/pr-<%= number %>-to-<%= base %>" label_pattern: "^backport/(?([^ ]+))$" - labels_template: "[ 'backport' ]" + labels_template: "[ \"backport\" ]" title_template: "[<%= base %>] <%= title %>" From 0f4f1033c7d4ec5c91b9b952ba6ea0c8d7240527 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 17 Aug 2023 01:00:05 +0200 Subject: [PATCH 5/5] Fix the incorrect file version --- scripts/VERSIONS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/VERSIONS.txt b/scripts/VERSIONS.txt index 4ceedd4fbe9..db4e10fa502 100644 --- a/scripts/VERSIONS.txt +++ b/scripts/VERSIONS.txt @@ -35,7 +35,7 @@ SkiaSharp file 3.0.0.0 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 -HarfBuzzSharp file 2.8.2.4 +HarfBuzzSharp file 2.8.2.30 # nuget versions # SkiaSharp