Skip to content

Commit 909d792

Browse files
authored
ci: update changesets to pick up new functionality (#4048)
1 parent 813bb77 commit 909d792

File tree

3 files changed

+41
-53
lines changed

3 files changed

+41
-53
lines changed

.github/scripts/change.mts

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -119,22 +119,6 @@ function checkMajorBumps(releases: ChangesetStatusOutput['releases']): void {
119119
process.exit(1);
120120
}
121121

122-
/** Run `changeset add` interactively, temporarily patching config.json with the correct baseBranch. */
123-
async function runAdd(baseBranch: string): Promise<void> {
124-
const configPath = '.changeset/config.json';
125-
const config = fs.readJsonSync(configPath);
126-
const originalBaseBranch: string = config.baseBranch;
127-
config.baseBranch = baseBranch;
128-
fs.writeJsonSync(configPath, config, { spaces: 2 });
129-
130-
try {
131-
await $({ stdio: 'inherit' })`yarn changeset`;
132-
} finally {
133-
config.baseBranch = originalBaseBranch;
134-
fs.writeJsonSync(configPath, config, { spaces: 2 });
135-
}
136-
}
137-
138122
/** Validate that all changed public packages have changesets and no major bumps are introduced. */
139123
async function runCheck(baseBranch: string): Promise<void> {
140124
log.info(`Validating changesets against ${baseBranch}...\n`);
@@ -155,6 +139,11 @@ async function runCheck(baseBranch: string): Promise<void> {
155139
log.success(packages ? `✅ All validations passed (${packages})` : '✅ All validations passed');
156140
}
157141

142+
/** Run `changeset add` interactively against the correct upstream base branch. */
143+
async function runAdd(baseBranch: string): Promise<void> {
144+
await $({ stdio: 'inherit' })`yarn changeset --since ${baseBranch}`;
145+
}
146+
158147
const { values: args } = parseArgs({ options: { check: { type: 'boolean', default: false } } });
159148

160149
const baseBranch = await getBaseBranch();

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@babel/preset-typescript": "catalog:",
4444
"@babel/runtime": "catalog:",
4545
"@changesets/changelog-github": "^0.5.0",
46-
"@changesets/cli": "^2.28.0",
46+
"@changesets/cli": "^2.30.0",
4747
"@rnx-kit/align-deps": "catalog:",
4848
"@rnx-kit/lint-lockfile": "catalog:",
4949
"babel-jest": "^29.7.0",

yarn.lock

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,11 +1894,11 @@ __metadata:
18941894
languageName: node
18951895
linkType: hard
18961896

1897-
"@changesets/apply-release-plan@npm:^7.0.14":
1898-
version: 7.0.14
1899-
resolution: "@changesets/apply-release-plan@npm:7.0.14"
1897+
"@changesets/apply-release-plan@npm:^7.1.0":
1898+
version: 7.1.0
1899+
resolution: "@changesets/apply-release-plan@npm:7.1.0"
19001900
dependencies:
1901-
"@changesets/config": "npm:^3.1.2"
1901+
"@changesets/config": "npm:^3.1.3"
19021902
"@changesets/get-version-range-type": "npm:^0.4.0"
19031903
"@changesets/git": "npm:^3.0.4"
19041904
"@changesets/should-skip-package": "npm:^0.1.2"
@@ -1911,7 +1911,7 @@ __metadata:
19111911
prettier: "npm:^2.7.1"
19121912
resolve-from: "npm:^5.0.0"
19131913
semver: "npm:^7.5.3"
1914-
checksum: 10c0/097c7ebcec758966b6728696498d59cfac23271aba2a56824ee307be1eefb2d0c6974aef1be4841e20b3458546ffacfd108c1afbf3acc512d6c3a4e30fa28622
1914+
checksum: 10c0/c8b4fa55f204a0c343c450ca44ae32a892752eaa81b594fb8941e9d1eb8675aba6245c8d80e5e9726e915d2643c542d22cba40d430c76a71ff438ad368d91f5c
19151915
languageName: node
19161916
linkType: hard
19171917

@@ -1949,32 +1949,30 @@ __metadata:
19491949
languageName: node
19501950
linkType: hard
19511951

1952-
"@changesets/cli@npm:^2.28.0":
1953-
version: 2.29.8
1954-
resolution: "@changesets/cli@npm:2.29.8"
1952+
"@changesets/cli@npm:^2.30.0":
1953+
version: 2.30.0
1954+
resolution: "@changesets/cli@npm:2.30.0"
19551955
dependencies:
1956-
"@changesets/apply-release-plan": "npm:^7.0.14"
1956+
"@changesets/apply-release-plan": "npm:^7.1.0"
19571957
"@changesets/assemble-release-plan": "npm:^6.0.9"
19581958
"@changesets/changelog-git": "npm:^0.2.1"
1959-
"@changesets/config": "npm:^3.1.2"
1959+
"@changesets/config": "npm:^3.1.3"
19601960
"@changesets/errors": "npm:^0.2.0"
19611961
"@changesets/get-dependents-graph": "npm:^2.1.3"
1962-
"@changesets/get-release-plan": "npm:^4.0.14"
1962+
"@changesets/get-release-plan": "npm:^4.0.15"
19631963
"@changesets/git": "npm:^3.0.4"
19641964
"@changesets/logger": "npm:^0.1.1"
19651965
"@changesets/pre": "npm:^2.0.2"
1966-
"@changesets/read": "npm:^0.6.6"
1966+
"@changesets/read": "npm:^0.6.7"
19671967
"@changesets/should-skip-package": "npm:^0.1.2"
19681968
"@changesets/types": "npm:^6.1.0"
19691969
"@changesets/write": "npm:^0.4.0"
19701970
"@inquirer/external-editor": "npm:^1.0.2"
19711971
"@manypkg/get-packages": "npm:^1.1.3"
19721972
ansi-colors: "npm:^4.1.3"
1973-
ci-info: "npm:^3.7.0"
19741973
enquirer: "npm:^2.4.1"
19751974
fs-extra: "npm:^7.0.1"
19761975
mri: "npm:^1.2.0"
1977-
p-limit: "npm:^2.2.0"
19781976
package-manager-detector: "npm:^0.2.0"
19791977
picocolors: "npm:^1.1.0"
19801978
resolve-from: "npm:^5.0.0"
@@ -1983,22 +1981,23 @@ __metadata:
19831981
term-size: "npm:^2.1.0"
19841982
bin:
19851983
changeset: bin.js
1986-
checksum: 10c0/85c32814698403f1634b649d96b8b32f04fa7f2065e455df672c0b39e9a2dc3a05538b82496536ac00aabf7810dfa68ff8049fa4f618e50ed00a29ceb302a7b5
1984+
checksum: 10c0/2b06343ae6df20b627ee89027f4078c074bdd758f82bb5dbf16ef7c4900138f733b59ceeb1c960fca1e9e59cf6973bb4d5984e4c7dd6d50a3949b39c490f31e0
19871985
languageName: node
19881986
linkType: hard
19891987

1990-
"@changesets/config@npm:^3.1.2":
1991-
version: 3.1.2
1992-
resolution: "@changesets/config@npm:3.1.2"
1988+
"@changesets/config@npm:^3.1.3":
1989+
version: 3.1.3
1990+
resolution: "@changesets/config@npm:3.1.3"
19931991
dependencies:
19941992
"@changesets/errors": "npm:^0.2.0"
19951993
"@changesets/get-dependents-graph": "npm:^2.1.3"
19961994
"@changesets/logger": "npm:^0.1.1"
1995+
"@changesets/should-skip-package": "npm:^0.1.2"
19971996
"@changesets/types": "npm:^6.1.0"
19981997
"@manypkg/get-packages": "npm:^1.1.3"
19991998
fs-extra: "npm:^7.0.1"
20001999
micromatch: "npm:^4.0.8"
2001-
checksum: 10c0/76065383cd5b7595f95ad7dc4aacfa74dd4ebb2ef956c30ea97e6f09b87b2e73b870676e7b294290b6cf9b1777983526bc8d3bb58dedd37dfa8a5ddbb02ebe1a
2000+
checksum: 10c0/68764135cbd014aca24b20429ffaf6f90e440286c7d233c33ddc968f0ab54b9e6e5dd5015a619dd0e0dd2eb172f028064a229fa610c260b779ff5315a840be1e
20022001
languageName: node
20032002
linkType: hard
20042003

@@ -2033,17 +2032,17 @@ __metadata:
20332032
languageName: node
20342033
linkType: hard
20352034

2036-
"@changesets/get-release-plan@npm:^4.0.14":
2037-
version: 4.0.14
2038-
resolution: "@changesets/get-release-plan@npm:4.0.14"
2035+
"@changesets/get-release-plan@npm:^4.0.15":
2036+
version: 4.0.15
2037+
resolution: "@changesets/get-release-plan@npm:4.0.15"
20392038
dependencies:
20402039
"@changesets/assemble-release-plan": "npm:^6.0.9"
2041-
"@changesets/config": "npm:^3.1.2"
2040+
"@changesets/config": "npm:^3.1.3"
20422041
"@changesets/pre": "npm:^2.0.2"
2043-
"@changesets/read": "npm:^0.6.6"
2042+
"@changesets/read": "npm:^0.6.7"
20442043
"@changesets/types": "npm:^6.1.0"
20452044
"@manypkg/get-packages": "npm:^1.1.3"
2046-
checksum: 10c0/24a15056955fc3967e023f058fa6c1e7550f3aad5c299264307a09b6d312868715684595bdb45a79c3f25fc809a70582be39861f3ae958d392b89a234f65b670
2045+
checksum: 10c0/d059c18ef5aab1c1aa1dd4f68d74e2fc351d965e28a76ab7f7c63c3290787d645f887d89c50b92f9f6bb63148a5d17329cfbb9cdea8e02c669a47768ec3456bc
20472046
languageName: node
20482047
linkType: hard
20492048

@@ -2076,13 +2075,13 @@ __metadata:
20762075
languageName: node
20772076
linkType: hard
20782077

2079-
"@changesets/parse@npm:^0.4.2":
2080-
version: 0.4.2
2081-
resolution: "@changesets/parse@npm:0.4.2"
2078+
"@changesets/parse@npm:^0.4.3":
2079+
version: 0.4.3
2080+
resolution: "@changesets/parse@npm:0.4.3"
20822081
dependencies:
20832082
"@changesets/types": "npm:^6.1.0"
20842083
js-yaml: "npm:^4.1.1"
2085-
checksum: 10c0/fdc1c99e01257e194a5ff59213993158deae9f84a66f5444a636645ff2655f67b6031589bab796a8c3ed653220d3c55fd62a6af2504a7c54bb541ac573119c5d
2084+
checksum: 10c0/4d8488eaf224974ae335fec964dc1dc486abcfa9f96856cf4267c2765b02ed6af1778375ec03d38252ebab9e191aa4a11c5f37a6ad42e907e08290fed2b9690c
20862085
languageName: node
20872086
linkType: hard
20882087

@@ -2098,18 +2097,18 @@ __metadata:
20982097
languageName: node
20992098
linkType: hard
21002099

2101-
"@changesets/read@npm:^0.6.6":
2102-
version: 0.6.6
2103-
resolution: "@changesets/read@npm:0.6.6"
2100+
"@changesets/read@npm:^0.6.7":
2101+
version: 0.6.7
2102+
resolution: "@changesets/read@npm:0.6.7"
21042103
dependencies:
21052104
"@changesets/git": "npm:^3.0.4"
21062105
"@changesets/logger": "npm:^0.1.1"
2107-
"@changesets/parse": "npm:^0.4.2"
2106+
"@changesets/parse": "npm:^0.4.3"
21082107
"@changesets/types": "npm:^6.1.0"
21092108
fs-extra: "npm:^7.0.1"
21102109
p-filter: "npm:^2.1.0"
21112110
picocolors: "npm:^1.1.0"
2112-
checksum: 10c0/a0a503061764bb391e00a37df1251c90356cf46519663dd517e58bc170c290f591abc1cff44569c88c87083360a36e2d756afcf7537b8725f4decfd915f838d3
2111+
checksum: 10c0/eebda5f5cea8684b9cb470e74cd5e67043a62ca54452ac88bb1a998bebeee1a2e3a642dc76818155a145863551c65f10f9c4ff85378b0419179fc60049edbbc6
21132112
languageName: node
21142113
linkType: hard
21152114

@@ -5049,7 +5048,7 @@ __metadata:
50495048
"@babel/preset-typescript": "catalog:"
50505049
"@babel/runtime": "catalog:"
50515050
"@changesets/changelog-github": "npm:^0.5.0"
5052-
"@changesets/cli": "npm:^2.28.0"
5051+
"@changesets/cli": "npm:^2.30.0"
50535052
"@rnx-kit/align-deps": "catalog:"
50545053
"@rnx-kit/lint-lockfile": "catalog:"
50555054
babel-jest: "npm:^29.7.0"
@@ -13013,7 +13012,7 @@ __metadata:
1301313012
languageName: node
1301413013
linkType: hard
1301513014

13016-
"ci-info@npm:^3.2.0, ci-info@npm:^3.7.0":
13015+
"ci-info@npm:^3.2.0":
1301713016
version: 3.9.0
1301813017
resolution: "ci-info@npm:3.9.0"
1301913018
checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a

0 commit comments

Comments
 (0)