bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 23:33:31 +00:00
Code Issues Releases Wiki Activity

Fix invalid directory

Browse Source
This commit is contained in:
Daniel García
2024-07-09 17:47:00 +02:00
parent c77156ab15
commit e2d45ef84d
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/build-desktop.yml vendored
View File

@@ -174,10 +174,10 @@ jobs:
with: with:
path: | path: |
apps/desktop/desktop_native/napi/*.node apps/desktop/desktop_native/napi/*.node
apps/desktop/desktop_native/proxy/dist/* apps/desktop/desktop_native/dist/*
${{ env.RUNNER_TEMP }}/.cargo/registry ${{ env.RUNNER_TEMP }}/.cargo/registry
${{ env.RUNNER_TEMP }}/.cargo/git ${{ env.RUNNER_TEMP }}/.cargo/git
key: rust-2-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} key: rust-3-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
- name: Build Native Module - name: Build Native Module
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
@@ -304,8 +304,8 @@ jobs:
with: with:
path: | path: |
apps/desktop/desktop_native/napi/*.node apps/desktop/desktop_native/napi/*.node
apps/desktop/desktop_native/proxy/dist/* apps/desktop/desktop_native/dist/*
key: rust-2-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} key: rust-3-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
- name: Build Native Module - name: Build Native Module
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
@@ -589,8 +589,8 @@ jobs:
with: with:
path: | path: |
apps/desktop/desktop_native/napi/*.node apps/desktop/desktop_native/napi/*.node
apps/desktop/desktop_native/proxy/dist/* apps/desktop/desktop_native/dist/*
key: rust-2-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} key: rust-3-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
- name: Check cache contents - name: Check cache contents
working-directory: apps/desktop/desktop_native working-directory: apps/desktop/desktop_native
@@ -767,8 +767,8 @@ jobs:
with: with:
path: | path: |
apps/desktop/desktop_native/napi/*.node apps/desktop/desktop_native/napi/*.node
apps/desktop/desktop_native/proxy/dist/* apps/desktop/desktop_native/dist/*
key: rust-2-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} key: rust-3-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
- name: Check cache contents - name: Check cache contents
working-directory: apps/desktop/desktop_native working-directory: apps/desktop/desktop_native
@@ -990,8 +990,8 @@ jobs:
with: with:
path: | path: |
apps/desktop/desktop_native/napi/*.node apps/desktop/desktop_native/napi/*.node
apps/desktop/desktop_native/proxy/dist/* apps/desktop/desktop_native/dist/*
key: rust-2-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} key: rust-3-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
- name: Check cache contents - name: Check cache contents
working-directory: apps/desktop/desktop_native working-directory: apps/desktop/desktop_native
@@ -1199,8 +1199,8 @@ jobs:
with: with:
path: | path: |
apps/desktop/desktop_native/napi/*.node apps/desktop/desktop_native/napi/*.node
apps/desktop/desktop_native/proxy/dist/* apps/desktop/desktop_native/dist/*
key: rust-2-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} key: rust-3-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }}
- name: Check cache contents - name: Check cache contents
working-directory: apps/desktop/desktop_native working-directory: apps/desktop/desktop_native

3
apps/desktop/desktop_native/build.js
View File

@@ -17,6 +17,7 @@ function buildProxyBin(target) {
} }
if (!crossPlatform) { if (!crossPlatform) {
console.log("Building native modules for the native architecture");
buildNapiModule(); buildNapiModule();
buildProxyBin(); buildProxyBin();
return; return;
@@ -52,6 +53,8 @@ switch (process.platform) {
break; break;
} }
console.log("Cross building native modules for the targets: ", targets.map(([target, _]) => target).join(", "));
fs.mkdirSync(path.join(__dirname, "dist"), { recursive: true }); fs.mkdirSync(path.join(__dirname, "dist"), { recursive: true });
targets.forEach(([target, nodeArch]) => { targets.forEach(([target, nodeArch]) => {