From 446471bb2fda70c985793048f519062c56479a83 Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Tue, 18 Jun 2024 18:53:08 +0800 Subject: [PATCH 1/5] u --- package.json | 7 ++++++- patches/@napi-rs__cli@3.0.0-alpha.45.patch | 12 ++++++++++++ pnpm-lock.yaml | 9 +++++++-- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 patches/@napi-rs__cli@3.0.0-alpha.45.patch diff --git a/package.json b/package.json index 09fd3170a13d..6d46a0cb2288 100644 --- a/package.json +++ b/package.json @@ -79,5 +79,10 @@ "webpack-cli": "5.1.4", "why-is-node-running": "2.2.2" }, - "packageManager": "pnpm@9.3.0" + "packageManager": "pnpm@9.3.0", + "pnpm": { + "patchedDependencies": { + "@napi-rs/cli@3.0.0-alpha.45": "patches/@napi-rs__cli@3.0.0-alpha.45.patch" + } + } } \ No newline at end of file diff --git a/patches/@napi-rs__cli@3.0.0-alpha.45.patch b/patches/@napi-rs__cli@3.0.0-alpha.45.patch new file mode 100644 index 000000000000..f12ea97a3e8f --- /dev/null +++ b/patches/@napi-rs__cli@3.0.0-alpha.45.patch @@ -0,0 +1,12 @@ +diff --git a/dist/api/build.js b/dist/api/build.js +index a9c86f2fa91ec42ff6869651eb39ec7da8a155ac..0361415e350100cd035d342c13dd9503c45fc3b5 100644 +--- a/dist/api/build.js ++++ b/dist/api/build.js +@@ -489,6 +489,7 @@ class Builder { + return dest; + } + catch (e) { ++ console.log('Failed to copy artifact:', e); + throw new Error('Failed to copy artifact', { + cause: e, + }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c95d46ae6e0..a08377a212d9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +patchedDependencies: + '@napi-rs/cli@3.0.0-alpha.45': + hash: coxn2uhcafeqfhph5u6z6xisju + path: patches/@napi-rs__cli@3.0.0-alpha.45.patch + importers: .: @@ -119,7 +124,7 @@ importers: devDependencies: '@napi-rs/cli': specifier: 3.0.0-alpha.45 - version: 3.0.0-alpha.45 + version: 3.0.0-alpha.45(patch_hash=coxn2uhcafeqfhph5u6z6xisju) crates/rspack_fs_node: devDependencies: @@ -11011,7 +11016,7 @@ snapshots: '@napi-rs/cli@2.18.0': {} - '@napi-rs/cli@3.0.0-alpha.45': + '@napi-rs/cli@3.0.0-alpha.45(patch_hash=coxn2uhcafeqfhph5u6z6xisju)': dependencies: '@napi-rs/cross-toolchain': 0.0.14 '@octokit/rest': 20.1.0 From 2a1e9c2fa27eff2bfc00a56fb9c67f0137e0d84b Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Tue, 18 Jun 2024 19:14:45 +0800 Subject: [PATCH 2/5] u --- .github/workflows/reusable-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index be1573d8df30..2fe0c7fb71d5 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -110,6 +110,12 @@ jobs: echo "exists=false" >> $GITHUB_OUTPUT fi + - name: Free disk cache + if: ${{ !startsWith(runner.name, 'GitHub Actions') && inputs.target == 'x86_64-unknown-linux-gnu' && steps.check_cache.outputs.exists != 'true' && !inputs.skipable }} + uses: jlumbroso/free-disk-space@main + with: + tool-cache: false + # Linux - name: Build x86_64-unknown-linux-gnu in Docker if: ${{ inputs.target == 'x86_64-unknown-linux-gnu' && steps.check_cache.outputs.exists != 'true' && !inputs.skipable }} From 6fb59f1e47d5b49ff3d012a03f667bc25e3df5d5 Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Tue, 18 Jun 2024 20:40:22 +0800 Subject: [PATCH 3/5] fix --- .github/workflows/reusable-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 2fe0c7fb71d5..c4ea515876b9 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -112,7 +112,7 @@ jobs: - name: Free disk cache if: ${{ !startsWith(runner.name, 'GitHub Actions') && inputs.target == 'x86_64-unknown-linux-gnu' && steps.check_cache.outputs.exists != 'true' && !inputs.skipable }} - uses: jlumbroso/free-disk-space@main + uses: jlumbroso/free-disk-space@main with: tool-cache: false From 3f5326b5182104137ecb4678ca09bfa409cefad2 Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Wed, 19 Jun 2024 08:21:00 +0800 Subject: [PATCH 4/5] u --- .github/workflows/reusable-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index c4ea515876b9..d99645a24c5d 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -111,7 +111,7 @@ jobs: fi - name: Free disk cache - if: ${{ !startsWith(runner.name, 'GitHub Actions') && inputs.target == 'x86_64-unknown-linux-gnu' && steps.check_cache.outputs.exists != 'true' && !inputs.skipable }} + if: ${{ startsWith(runner.name, 'GitHub Actions') && inputs.target == 'x86_64-unknown-linux-gnu' && steps.check_cache.outputs.exists != 'true' && !inputs.skipable }} uses: jlumbroso/free-disk-space@main with: tool-cache: false From 8c8ea8f97f7862ac1fd9f90b8172d17666b0ea40 Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Wed, 19 Jun 2024 09:28:27 +0800 Subject: [PATCH 5/5] u --- .github/workflows/reusable-build.yml | 1 + package.json | 7 +------ patches/@napi-rs__cli@3.0.0-alpha.45.patch | 12 ------------ pnpm-lock.yaml | 9 ++------- 4 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 patches/@napi-rs__cli@3.0.0-alpha.45.patch diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index d99645a24c5d..1c8c33062446 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -110,6 +110,7 @@ jobs: echo "exists=false" >> $GITHUB_OUTPUT fi + # Fix: Resolve disk space error "ENOSPC: no space left on device" on GitHub Actions runners - name: Free disk cache if: ${{ startsWith(runner.name, 'GitHub Actions') && inputs.target == 'x86_64-unknown-linux-gnu' && steps.check_cache.outputs.exists != 'true' && !inputs.skipable }} uses: jlumbroso/free-disk-space@main diff --git a/package.json b/package.json index 6d46a0cb2288..09fd3170a13d 100644 --- a/package.json +++ b/package.json @@ -79,10 +79,5 @@ "webpack-cli": "5.1.4", "why-is-node-running": "2.2.2" }, - "packageManager": "pnpm@9.3.0", - "pnpm": { - "patchedDependencies": { - "@napi-rs/cli@3.0.0-alpha.45": "patches/@napi-rs__cli@3.0.0-alpha.45.patch" - } - } + "packageManager": "pnpm@9.3.0" } \ No newline at end of file diff --git a/patches/@napi-rs__cli@3.0.0-alpha.45.patch b/patches/@napi-rs__cli@3.0.0-alpha.45.patch deleted file mode 100644 index f12ea97a3e8f..000000000000 --- a/patches/@napi-rs__cli@3.0.0-alpha.45.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dist/api/build.js b/dist/api/build.js -index a9c86f2fa91ec42ff6869651eb39ec7da8a155ac..0361415e350100cd035d342c13dd9503c45fc3b5 100644 ---- a/dist/api/build.js -+++ b/dist/api/build.js -@@ -489,6 +489,7 @@ class Builder { - return dest; - } - catch (e) { -+ console.log('Failed to copy artifact:', e); - throw new Error('Failed to copy artifact', { - cause: e, - }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4cb8fe951f70..da82e57311fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,11 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -patchedDependencies: - '@napi-rs/cli@3.0.0-alpha.45': - hash: coxn2uhcafeqfhph5u6z6xisju - path: patches/@napi-rs__cli@3.0.0-alpha.45.patch - importers: .: @@ -124,7 +119,7 @@ importers: devDependencies: '@napi-rs/cli': specifier: 3.0.0-alpha.45 - version: 3.0.0-alpha.45(patch_hash=coxn2uhcafeqfhph5u6z6xisju) + version: 3.0.0-alpha.45 crates/rspack_fs_node: devDependencies: @@ -11016,7 +11011,7 @@ snapshots: '@napi-rs/cli@2.18.0': {} - '@napi-rs/cli@3.0.0-alpha.45(patch_hash=coxn2uhcafeqfhph5u6z6xisju)': + '@napi-rs/cli@3.0.0-alpha.45': dependencies: '@napi-rs/cross-toolchain': 0.0.14 '@octokit/rest': 20.1.0