From fd4b91d22b1e94db1bf074124bdd579425cdd5ed Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 20 Nov 2024 01:21:16 +0100 Subject: [PATCH 1/2] revert: "feat: add linux-riscv64 build (#8779)" This reverts commit 020e64b9179ba526d6ce0edd1f32ccf43180ce41. --- .meta-updater/src/index.ts | 2 +- __utils__/scripts/src/copy-artifacts.ts | 1 - pnpm-lock.yaml | 9 -------- pnpm/artifacts/exe/package.json | 1 - pnpm/artifacts/linux-riscv64/.gitignore | 1 - pnpm/artifacts/linux-riscv64/.npmignore | 1 - pnpm/artifacts/linux-riscv64/CHANGELOG.md | 1 - pnpm/artifacts/linux-riscv64/README.md | 1 - pnpm/artifacts/linux-riscv64/package.json | 28 ----------------------- pnpm/package-linux-riscv64.json | 12 ---------- 10 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pnpm/artifacts/linux-riscv64/.gitignore delete mode 100644 pnpm/artifacts/linux-riscv64/.npmignore delete mode 100644 pnpm/artifacts/linux-riscv64/CHANGELOG.md delete mode 100644 pnpm/artifacts/linux-riscv64/README.md delete mode 100644 pnpm/artifacts/linux-riscv64/package.json delete mode 100644 pnpm/package-linux-riscv64.json diff --git a/.meta-updater/src/index.ts b/.meta-updater/src/index.ts index c35e0e52cc7..b25343ee49c 100644 --- a/.meta-updater/src/index.ts +++ b/.meta-updater/src/index.ts @@ -72,7 +72,7 @@ export default async (workspaceDir: string) => { // eslint-disable-line if (dir.includes('artifacts') || manifest.name === '@pnpm/exe') { manifest.version = pnpmVersion if (manifest.name === '@pnpm/exe') { - for (const depName of ['@pnpm/linux-arm64', '@pnpm/linux-riscv64', '@pnpm/linux-x64', '@pnpm/win-x64', '@pnpm/win-arm64', '@pnpm/macos-x64', '@pnpm/macos-arm64']) { + for (const depName of ['@pnpm/linux-arm64', '@pnpm/linux-x64', '@pnpm/win-x64', '@pnpm/win-arm64', '@pnpm/macos-x64', '@pnpm/macos-arm64']) { manifest.optionalDependencies![depName] = 'workspace:*' } } diff --git a/__utils__/scripts/src/copy-artifacts.ts b/__utils__/scripts/src/copy-artifacts.ts index 171255119dc..6ba12a7f255 100644 --- a/__utils__/scripts/src/copy-artifacts.ts +++ b/__utils__/scripts/src/copy-artifacts.ts @@ -19,7 +19,6 @@ const artifactsDir = path.join(repoRoot, 'pnpm/artifacts') copyArtifact('linuxstatic-x64/pnpm', 'pnpm-linuxstatic-x64') copyArtifact('linuxstatic-arm64/pnpm', 'pnpm-linuxstatic-arm64') copyArtifact('linux-arm64/pnpm', 'pnpm-linux-arm64') - copyArtifact('linux-riscv64/pnpm', 'pnpm-linux-riscv64') copyArtifact('macos-x64/pnpm', 'pnpm-macos-x64') copyArtifact('macos-arm64/pnpm', 'pnpm-macos-arm64') copyArtifact('win-x64/pnpm.exe', 'pnpm-win-x64.exe') diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e7bc7e9d237..97453b9c3cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5915,9 +5915,6 @@ importers: '@pnpm/linux-arm64': specifier: workspace:* version: link:../linux-arm64 - '@pnpm/linux-riscv64': - specifier: workspace:* - version: link:../linux-riscv64 '@pnpm/linux-x64': specifier: workspace:* version: link:../linux-x64 @@ -5950,12 +5947,6 @@ importers: specifier: workspace:* version: 'link:' - pnpm/artifacts/linux-riscv64: - devDependencies: - '@pnpm/linux-riscv64': - specifier: workspace:* - version: 'link:' - pnpm/artifacts/linux-x64: devDependencies: '@pnpm/linux-x64': diff --git a/pnpm/artifacts/exe/package.json b/pnpm/artifacts/exe/package.json index 6e9c9b535c2..73d0582d3cc 100644 --- a/pnpm/artifacts/exe/package.json +++ b/pnpm/artifacts/exe/package.json @@ -13,7 +13,6 @@ }, "optionalDependencies": { "@pnpm/linux-arm64": "workspace:*", - "@pnpm/linux-riscv64": "workspace:*", "@pnpm/linux-x64": "workspace:*", "@pnpm/macos-arm64": "workspace:*", "@pnpm/macos-x64": "workspace:*", diff --git a/pnpm/artifacts/linux-riscv64/.gitignore b/pnpm/artifacts/linux-riscv64/.gitignore deleted file mode 100644 index 84e907ed6fd..00000000000 --- a/pnpm/artifacts/linux-riscv64/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pnpm \ No newline at end of file diff --git a/pnpm/artifacts/linux-riscv64/.npmignore b/pnpm/artifacts/linux-riscv64/.npmignore deleted file mode 100644 index 3a2d9d511ab..00000000000 --- a/pnpm/artifacts/linux-riscv64/.npmignore +++ /dev/null @@ -1 +0,0 @@ -nodes diff --git a/pnpm/artifacts/linux-riscv64/CHANGELOG.md b/pnpm/artifacts/linux-riscv64/CHANGELOG.md deleted file mode 100644 index 4802615b1be..00000000000 --- a/pnpm/artifacts/linux-riscv64/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -# @pnpm/linux-riscv64 diff --git a/pnpm/artifacts/linux-riscv64/README.md b/pnpm/artifacts/linux-riscv64/README.md deleted file mode 100644 index 4802615b1be..00000000000 --- a/pnpm/artifacts/linux-riscv64/README.md +++ /dev/null @@ -1 +0,0 @@ -# @pnpm/linux-riscv64 diff --git a/pnpm/artifacts/linux-riscv64/package.json b/pnpm/artifacts/linux-riscv64/package.json deleted file mode 100644 index 96a824ba1cb..00000000000 --- a/pnpm/artifacts/linux-riscv64/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "@pnpm/linux-riscv64", - "version": "9.14.0", - "license": "MIT", - "publishConfig": { - "bin": { - "pnpm": "pnpm" - }, - "os": [ - "linux" - ], - "cpu": [ - "riscv64" - ] - }, - "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/blob/master/packages/artifacts/linux-arm64", - "homepage": "https://github.com/pnpm/pnpm/blob/master/packages/artifacts/linux-arm64#readme", - "bugs": { - "url": "https://github.com/pnpm/pnpm/issues" - }, - "keywords": [ - "pnpm9" - ], - "devDependencies": { - "@pnpm/linux-riscv64": "workspace:*" - } -} diff --git a/pnpm/package-linux-riscv64.json b/pnpm/package-linux-riscv64.json deleted file mode 100644 index 9f1620a857d..00000000000 --- a/pnpm/package-linux-riscv64.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "pkg": { - "assets": [ - "dist/worker.js", - "dist/pnpmrc", - "dist/scripts/*", - "dist/templates/*" - ], - "targets": ["node20-linux-riscv64"], - "outputPath": "../linux-riscv64" - } -} From 55fb7a62cb26883d94285fb52bce3ae16523c70b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 20 Nov 2024 01:22:12 +0100 Subject: [PATCH 2/2] chore(release): 9.14.1 --- pnpm/CHANGELOG.md | 2 +- pnpm/artifacts/exe/package.json | 2 +- pnpm/artifacts/linux-arm64/package.json | 2 +- pnpm/artifacts/linux-x64/package.json | 2 +- pnpm/artifacts/macos-arm64/package.json | 2 +- pnpm/artifacts/macos-x64/package.json | 2 +- pnpm/artifacts/win-arm64/package.json | 2 +- pnpm/artifacts/win-x64/package.json | 2 +- pnpm/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pnpm/CHANGELOG.md b/pnpm/CHANGELOG.md index adf298d1505..b7d96c5ce02 100644 --- a/pnpm/CHANGELOG.md +++ b/pnpm/CHANGELOG.md @@ -1,6 +1,6 @@ # pnpm -## 9.14.0 +## 9.14.1 ### Minor Changes diff --git a/pnpm/artifacts/exe/package.json b/pnpm/artifacts/exe/package.json index 73d0582d3cc..25264b4723b 100644 --- a/pnpm/artifacts/exe/package.json +++ b/pnpm/artifacts/exe/package.json @@ -1,7 +1,7 @@ { "name": "@pnpm/exe", "description": "Fast, disk space efficient package manager", - "version": "9.14.0", + "version": "9.14.1", "publishConfig": { "tag": "next-9", "bin": { diff --git a/pnpm/artifacts/linux-arm64/package.json b/pnpm/artifacts/linux-arm64/package.json index 620336a5bb9..758a3cdfa7d 100644 --- a/pnpm/artifacts/linux-arm64/package.json +++ b/pnpm/artifacts/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@pnpm/linux-arm64", - "version": "9.14.0", + "version": "9.14.1", "license": "MIT", "publishConfig": { "bin": { diff --git a/pnpm/artifacts/linux-x64/package.json b/pnpm/artifacts/linux-x64/package.json index 74bf5783e80..b43d25d555f 100644 --- a/pnpm/artifacts/linux-x64/package.json +++ b/pnpm/artifacts/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@pnpm/linux-x64", - "version": "9.14.0", + "version": "9.14.1", "license": "MIT", "publishConfig": { "bin": { diff --git a/pnpm/artifacts/macos-arm64/package.json b/pnpm/artifacts/macos-arm64/package.json index d599762b289..5b140ab5f79 100644 --- a/pnpm/artifacts/macos-arm64/package.json +++ b/pnpm/artifacts/macos-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@pnpm/macos-arm64", - "version": "9.14.0", + "version": "9.14.1", "license": "MIT", "publishConfig": { "bin": { diff --git a/pnpm/artifacts/macos-x64/package.json b/pnpm/artifacts/macos-x64/package.json index f3ad1e4a80c..8e582ce7372 100644 --- a/pnpm/artifacts/macos-x64/package.json +++ b/pnpm/artifacts/macos-x64/package.json @@ -1,6 +1,6 @@ { "name": "@pnpm/macos-x64", - "version": "9.14.0", + "version": "9.14.1", "license": "MIT", "publishConfig": { "bin": { diff --git a/pnpm/artifacts/win-arm64/package.json b/pnpm/artifacts/win-arm64/package.json index 894afb3b75d..1759bd668ce 100644 --- a/pnpm/artifacts/win-arm64/package.json +++ b/pnpm/artifacts/win-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@pnpm/win-arm64", - "version": "9.14.0", + "version": "9.14.1", "license": "MIT", "publishConfig": { "bin": { diff --git a/pnpm/artifacts/win-x64/package.json b/pnpm/artifacts/win-x64/package.json index e0128c50bb2..71029dae12c 100644 --- a/pnpm/artifacts/win-x64/package.json +++ b/pnpm/artifacts/win-x64/package.json @@ -1,6 +1,6 @@ { "name": "@pnpm/win-x64", - "version": "9.14.0", + "version": "9.14.1", "license": "MIT", "publishConfig": { "bin": { diff --git a/pnpm/package.json b/pnpm/package.json index 18632189f70..36f27113a84 100644 --- a/pnpm/package.json +++ b/pnpm/package.json @@ -1,7 +1,7 @@ { "name": "pnpm", "description": "Fast, disk space efficient package manager", - "version": "9.14.0", + "version": "9.14.1", "bin": { "pnpm": "bin/pnpm.cjs", "pnpx": "bin/pnpx.cjs"