diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml new file mode 100644 index 00000000000..e5e5ed67fde --- /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 %>" diff --git a/scripts/VERSIONS.txt b/scripts/VERSIONS.txt index de11343aae3..c14e2987806 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 diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index 46b6f1c9450..f0c44874d6e 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 5f5bb20ad19..3b72b46332b 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 c1bd3489f08..c575ad18e46 100644 --- a/scripts/azure-templates-stages.yml +++ b/scripts/azure-templates-stages.yml @@ -456,9 +456,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')) }}: @@ -820,7 +820,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