Skip to content

Commit aed992b

Browse files
committed
fix(action): allow ignored packages
1 parent 07dc948 commit aed992b

File tree

4 files changed

+7766
-5209
lines changed

4 files changed

+7766
-5209
lines changed

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
"main": "dist/index.js",
55
"license": "MIT",
66
"devDependencies": {
7-
"@changesets/changelog-github": "^0.4.2",
8-
"@changesets/cli": "^2.20.0",
9-
"@changesets/write": "^0.1.6",
10-
"@vercel/ncc": "^0.36.1",
11-
"fixturez": "^1.1.0",
12-
"prettier": "^2.0.5",
13-
"typescript": "^5.0.4",
147
"@babel/core": "^7.13.10",
158
"@babel/preset-env": "^7.13.10",
169
"@babel/preset-typescript": "^7.13.0",
10+
"@changesets/changelog-github": "^0.4.2",
11+
"@changesets/cli": "^2.20.0",
12+
"@changesets/write": "^0.1.6",
1713
"@types/fs-extra": "^8.0.0",
1814
"@types/jest": "^29.5.1",
1915
"@types/node": "^20.11.17",
2016
"@types/semver": "^7.5.0",
17+
"@vercel/ncc": "^0.36.1",
2118
"babel-jest": "^29.5.0",
19+
"fixturez": "^1.1.0",
2220
"husky": "^3.0.3",
23-
"jest": "^29.5.0"
21+
"jest": "^29.5.0",
22+
"prettier": "^2.0.5",
23+
"typescript": "^5.0.4"
2424
},
2525
"scripts": {
2626
"build": "ncc build src/index.ts -o dist --transpile-only --minify",
@@ -37,6 +37,7 @@
3737
"@actions/core": "^1.10.0",
3838
"@actions/exec": "^1.1.1",
3939
"@actions/github": "^5.1.1",
40+
"@changesets/get-release-plan": "^4.0.4",
4041
"@changesets/pre": "^1.0.9",
4142
"@changesets/read": "^0.5.3",
4243
"@manypkg/get-packages": "^1.1.3",
@@ -54,7 +55,6 @@
5455
},
5556
"prettier": {},
5657
"resolutions": {
57-
"**/@octokit/core": "4.2.0",
5858
"trim": "^0.0.3",
5959
"y18n": "^4.0.1"
6060
}

src/index.ts

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import * as core from "@actions/core";
22
import fs from "fs-extra";
33
import * as gitUtils from "./gitUtils";
44
import { runPublish, runVersion } from "./run";
5-
import readChangesetState from "./readChangesetState";
5+
// import readChangesetState from "./readChangesetState";
6+
import getReleasePlan from "@changesets/get-release-plan";
67

78
const getOptionalInput = (name: string) => core.getInput(name) || undefined;
89

@@ -33,26 +34,31 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
3334
`machine github.com\nlogin github-actions[bot]\npassword ${githubToken}`
3435
);
3536

36-
let { changesets } = await readChangesetState();
37+
const { changesets, releases } = await getReleasePlan(process.cwd());
3738

3839
let publishScript = core.getInput("publish");
3940
let hasChangesets = changesets.length !== 0;
40-
const hasNonEmptyChangesets = changesets.some(
41-
(changeset) => changeset.releases.length > 0
42-
);
41+
// const hasNonEmptyChangesets = changesets.some(
42+
// (changeset) => changeset.releases.length > 0
43+
// );
4344
let hasPublishScript = !!publishScript;
45+
const hasReleases = releases.length !== 0;
4446

4547
core.setOutput("published", "false");
4648
core.setOutput("publishedPackages", "[]");
49+
// TODO: deprecate `hasChangesets` in favor of `hasReleases`
4750
core.setOutput("hasChangesets", String(hasChangesets));
51+
core.setOutput("hasReleases", String(hasReleases));
4852

4953
switch (true) {
50-
case !hasChangesets && !hasPublishScript:
51-
core.info("No changesets present or were removed by merging release PR. Not publishing because no publish script found.");
54+
case !hasReleases && !hasPublishScript:
55+
core.info(
56+
"No releases present or were removed by merging release PR. Not publishing because no publish script found."
57+
);
5258
return;
53-
case !hasChangesets && hasPublishScript: {
59+
case !hasReleases && hasPublishScript: {
5460
core.info(
55-
"No changesets found. Attempting to publish any unpublished packages to npm"
61+
"No releases found. Attempting to publish any unpublished packages to npm"
5662
);
5763

5864
let userNpmrcPath = `${process.env.HOME}/.npmrc`;
@@ -99,10 +105,7 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
99105
}
100106
return;
101107
}
102-
case hasChangesets && !hasNonEmptyChangesets:
103-
core.info("All changesets are empty; not creating PR");
104-
return;
105-
case hasChangesets:
108+
case hasReleases:
106109
const { pullRequestNumber } = await runVersion({
107110
script: getOptionalInput("version"),
108111
githubToken,

0 commit comments

Comments
 (0)