Skip to content

Commit ca683b3

Browse files
committed
Use "Rebuild" workflow instead of "Update dependencies"
1 parent a41539b commit ca683b3

File tree

6 files changed

+9
-91
lines changed

6 files changed

+9
-91
lines changed

.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/post-release-mergeback.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# tag
44
# 2. Updates the `vN` tag to refer to this merge commit.
55
# 3. Iff vN == vLatest, merges any changes from the release back into the main branch.
6-
# Typically, this is two commits – one to update the version number and one to update dependencies.
6+
# Typically, this is two commits – one to update the version number and one to rebuild.
77
name: Tag release and merge back
88

99
on:
@@ -138,8 +138,8 @@ jobs:
138138
139139
Please do the following:
140140
141-
- [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
142-
- [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
141+
- [ ] Remove and re-add the "Rebuild" label to the PR to trigger just this workflow.
142+
- [ ] Wait for the "Rebuild" workflow to push a commit updating the distribution files.
143143
- [ ] Mark the PR as ready for review to trigger the full set of PR checks.
144144
- [ ] Approve and merge the PR. When merging the PR, make sure "Create a merge commit" is
145145
selected rather than "Squash and merge" or "Rebase and merge".
@@ -162,7 +162,7 @@ jobs:
162162
--head "${NEW_BRANCH}" \
163163
--base "${BASE_BRANCH}" \
164164
--title "${pr_title}" \
165-
--label "Update dependencies" \
165+
--label "Rebuild" \
166166
--body "${pr_body}" \
167167
--assignee "${GITHUB_ACTOR}" \
168168
--draft

.github/workflows/pr-checks.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717
contents: read
1818
security-events: write # needed to upload ESLint results
1919

20-
strategy:
21-
fail-fast: false
22-
2320
steps:
2421
- name: Checkout
2522
uses: actions/checkout@v5
@@ -37,19 +34,6 @@ jobs:
3734
- name: Check generated JS
3835
run: .github/workflows/script/check-js.sh
3936

40-
check-node-modules:
41-
if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
42-
name: Check modules up to date
43-
permissions:
44-
contents: read
45-
runs-on: macos-latest
46-
timeout-minutes: 45
47-
48-
steps:
49-
- uses: actions/checkout@v5
50-
- name: Check node modules up to date
51-
run: .github/workflows/script/check-node-modules.sh
52-
5337
check-file-contents:
5438
if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
5539
name: Check file contents
@@ -74,7 +58,6 @@ jobs:
7458
npm-test:
7559
if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
7660
name: Unit Test
77-
needs: [check-js, check-node-modules]
7861
strategy:
7962
fail-fast: false
8063
matrix:

.github/workflows/script/check-node-modules.sh

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

.github/workflows/update-dependencies.yml

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

0 commit comments

Comments
 (0)