Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2d92b76

Browse files
henrymercerhenrymercer
authored
Merge pull request #3067 from github/update-v3.30.0-92eada825
Merge main into releases/v3
2 parents 3c3833e + 390daaf commit 2d92b76

File tree

23,867 files changed

+1135661
-5266844
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

23,867 files changed

+1135661
-5266844
lines changed

‎.github/actions/prepare-mergeback-branch/action.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: "Prepare mergeback branch"
2+
description: Prepares a mergeback branch and opens a PR for it
3+
inputs:
4+
base:
5+
description: "The name of the base branch"
6+
required: true
7+
head:
8+
description: "The name of the head branch"
9+
required: true
10+
branch:
11+
description: "The name of the branch to create."
12+
required: true
13+
version:
14+
description: "The new version"
15+
required: true
16+
token:
17+
description: "The token to use"
18+
required: true
19+
dry-run:
20+
description: "Set to true to skip creating the PR. The branch will still be pushed."
21+
default: "false"
22+
runs:
23+
using: composite
24+
steps:
25+
- name: Create mergeback branch
26+
shell: bash
27+
env:
28+
VERSION: "${{ inputs.version }}"
29+
NEW_BRANCH: "${{ inputs.branch }}"
30+
run: |
31+
set -exu
32+
33+
# Ensure we are on the new branch
34+
git checkout "${NEW_BRANCH}"
35+
36+
# Update the version number ready for the next release
37+
npm version patch --no-git-tag-version
38+
39+
# Update the changelog, adding a new version heading directly above the most recent existing one
40+
awk '!f && /##/{print "'"## [UNRELEASED]\n\nNo user facing changes.\n"'"; f=1}1' CHANGELOG.md > temp && mv temp CHANGELOG.md
41+
git add .
42+
git commit -m "Update changelog and version after ${VERSION}"
43+
44+
git push origin "${NEW_BRANCH}"
45+
46+
- name: Create PR
47+
shell: bash
48+
if: inputs.dry-run != 'true'
49+
env:
50+
VERSION: "${{ inputs.version }}"
51+
BASE_BRANCH: "${{ inputs.base }}"
52+
HEAD_BRANCH: "${{ inputs.head }}"
53+
NEW_BRANCH: "${{ inputs.branch }}"
54+
GITHUB_TOKEN: "${{ inputs.token }}"
55+
run: |
56+
set -exu
57+
pr_title="Mergeback ${VERSION} ${HEAD_BRANCH} into ${BASE_BRANCH}"
58+
pr_body=$(cat << EOF
59+
This PR bumps the version number and updates the changelog after the ${VERSION} release.
60+
61+
Please do the following:
62+
63+
- [ ] Remove and re-add the "Rebuild" label to the PR to trigger just this workflow.
64+
- [ ] Wait for the "Rebuild" workflow to push a commit updating the distribution files.
65+
- [ ] Mark the PR as ready for review to trigger the full set of PR checks.
66+
- [ ] Approve and merge the PR. When merging the PR, make sure "Create a merge commit" is
67+
selected rather than "Squash and merge" or "Rebase and merge".
68+
EOF
69+
)
70+
71+
# PR checks won't be triggered on PRs created by Actions. Therefore mark the PR as draft
72+
# so that a maintainer can take the PR out of draft, thereby triggering the PR checks.
73+
gh pr create \
74+
--head "${NEW_BRANCH}" \
75+
--base "${BASE_BRANCH}" \
76+
--title "${pr_title}" \
77+
--label "Rebuild" \
78+
--body "${pr_body}" \
79+
--assignee "${GITHUB_ACTOR}" \
80+
--draft

‎.github/actions/setup-swift/action.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ updates:
55
schedule:
66
interval: weekly
77
labels:
8-
- Update dependencies
8+
- Rebuild
99
# Ignore incompatible dependency updates
1010
ignore:
1111
# There is a type incompatibility issue between v0.0.9 and our other dependencies.

‎.github/update-release-branch.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ def open_pr(
9797
body.append(' - [ ] Ensure the docs team is aware of any documentation changes that need to be released.')
9898

9999
if not is_primary_release:
100-
body.append(' - [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.')
101-
body.append(' - [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.')
100+
body.append(' - [ ] Remove and re-add the "Rebuild" label to the PR to trigger just this workflow.')
101+
body.append(' - [ ] Wait for the "Rebuild" workflow to push a commit updating the distribution files.')
102102

103103
body.append(' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.')
104104
body.append(' - [ ] Approve and merge this PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.')
@@ -108,7 +108,7 @@ def open_pr(
108108
body.append(' - [ ] Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.')
109109

110110
title = f'Merge {source_branch} into {target_branch}'
111-
labels = ['Update dependencies'] if not is_primary_release else []
111+
labels = ['Rebuild'] if not is_primary_release else []
112112

113113
# Create the pull request
114114
# PR checks won't be triggered on PRs created by Actions. Therefore mark the PR as draft so that
@@ -389,7 +389,7 @@ def main():
389389

390390
# Migrate the package version number from a vLatest version number to a vOlder version number
391391
print(f'Setting version number to {version} in package.json')
392-
replace_version_package_json(get_current_version(), version) # We rely on the `Update dependencies` workflow to update package-lock.json
392+
replace_version_package_json(get_current_version(), version) # We rely on the `Rebuild` workflow to update package-lock.json
393393
run_git('add', 'package.json')
394394

395395
# Migrate the changelog notes from vLatest version numbers to vOlder version numbers

‎.github/workflows/__autobuild-direct-tracing-with-working-dir.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__autobuild-direct-tracing.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__config-input.yml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__export-file-baseline-information.yml

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__multi-language-autodetect.yml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__packaging-codescanning-config-inputs-js.yml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)