Skip to content

Commit

Permalink
replace tarball renaming scripts with oclif patch (#1846)
Browse files Browse the repository at this point in the history
  • Loading branch information
YaroShkvorets authored Dec 17, 2024
1 parent 56f61b2 commit 1651e60
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 39 deletions.
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,10 @@
"@types/node": "^22.10.1",
"eslint": "9.16.0",
"prettier": "3.4.2"
},
"pnpm": {
"patchedDependencies": {
"oclif@4.16.0": "patches/oclif@4.16.0.patch"
}
}
}
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
"scripts": {
"build": "tsc -b tsconfig.build.json && oclif manifest && oclif readme && copyfiles -u 1 src/**/*.graphql dist/",
"oclif:pack": "npm pack && pnpm oclif pack tarballs --no-xz && node scripts/rename-tarballs.mjs",
"oclif:pack": "npm pack && pnpm oclif pack tarballs --no-xz",
"test": "vitest run --bail=1",
"test:add": "vitest run tests/cli/add.test.ts",
"test:init": "vitest run tests/cli/init.test.ts",
Expand Down
35 changes: 0 additions & 35 deletions packages/cli/scripts/rename-tarballs.mjs

This file was deleted.

11 changes: 10 additions & 1 deletion patches/oclif@4.16.0.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/lib/tarballs/build.js b/lib/tarballs/build.js
index a7577a89c721bf4a52657f037fcc079e8fa9dca3..ebf5245840ac671064c8699f166102b2cc5d85c3 100644
index a7577a89c721bf4a52657f037fcc079e8fa9dca3..51c33346763dee8c60a3b59b8c46b6789c496239 100644
--- a/lib/tarballs/build.js
+++ b/lib/tarballs/build.js
@@ -195,8 +195,10 @@ const addDependencies = async (c) => {
Expand All @@ -15,3 +15,12 @@ index a7577a89c721bf4a52657f037fcc079e8fa9dca3..ebf5245840ac671064c8699f166102b2
await exec('npm install --production', { cwd: c.workspace() });
}
};
@@ -229,7 +231,7 @@ const buildTarget = async (target, c, options) => {
const { bin, version } = c.config;
const { gitSha: sha } = c;
const templateShortKeyCommonOptions = { arch, bin, platform, sha, version };
- const [gzLocalKey, xzLocalKey] = ['.tar.gz', '.tar.xz'].map((ext) => (0, upload_util_1.templateShortKey)('versioned', { ...templateShortKeyCommonOptions, ext }));
+ const [gzLocalKey, xzLocalKey] = ['.tar.gz', '.tar.xz'].map((ext) => (0, upload_util_1.templateShortKey)('unversioned', { ...templateShortKeyCommonOptions, ext }));
const base = path.basename(gzLocalKey);
(0, log_1.log)(`building target ${base}`);
(0, log_1.log)('copying workspace', c.workspace(), workspace);
9 changes: 7 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1651e60

Please sign in to comment.