bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-28 15:23:53 +00:00
Code Issues Releases Wiki Activity

feat: remove support for musl

Browse Source
This commit is contained in:
Andreas Coroiu
2025-10-07 13:53:53 +02:00
parent 29b35fd32f
commit a3e654d42d
4 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,7 @@ jobs:
- name: Set up environment - name: Set up environment
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get -y install pkg-config libxss-dev rpm musl-dev musl-tools flatpak flatpak-builder sudo apt-get -y install pkg-config libxss-dev rpm flatpak flatpak-builder
- name: Set up Snap - name: Set up Snap
run: sudo snap install snapcraft --classic run: sudo snap install snapcraft --classic
@@ -236,10 +236,8 @@ jobs:
env: env:
PKG_CONFIG_ALLOW_CROSS: true PKG_CONFIG_ALLOW_CROSS: true
PKG_CONFIG_ALL_STATIC: true PKG_CONFIG_ALL_STATIC: true
TARGET: musl
run: | run: |
rustup target add x86_64-unknown-linux-musl node build.js --release
node build.js --target=x86_64-unknown-linux-musl --release
- name: Build application - name: Build application
run: npm run dist:lin run: npm run dist:lin
@@ -332,7 +330,7 @@ jobs:
- name: Set up environment - name: Set up environment
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get -y install pkg-config libxss-dev rpm musl-dev musl-tools flatpak flatpak-builder sudo apt-get -y install pkg-config libxss-dev rpm flatpak flatpak-builder
- name: Print environment - name: Print environment
run: | run: |
@@ -382,12 +380,8 @@ jobs:
env: env:
PKG_CONFIG_ALLOW_CROSS: true PKG_CONFIG_ALLOW_CROSS: true
PKG_CONFIG_ALL_STATIC: true PKG_CONFIG_ALL_STATIC: true
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-musl-gcc
CC: aarch64-linux-musl-gcc
TARGET: musl
run: | run: |
rustup target add aarch64-unknown-linux-musl node build.js --release
node build.js --target=aarch64-unknown-linux-musl --release
- name: Check index.d.ts generated - name: Check index.d.ts generated
if: github.event_name == 'pull_request' && steps.cache.outputs.cache-hit != 'true' if: github.event_name == 'pull_request' && steps.cache.outputs.cache-hit != 'true'

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

@@ -11,8 +11,8 @@ const rustTargetsMap = {
"aarch64-pc-windows-msvc": { nodeArch: 'arm64', platform: 'win32' }, "aarch64-pc-windows-msvc": { nodeArch: 'arm64', platform: 'win32' },
"x86_64-apple-darwin": { nodeArch: 'x64', platform: 'darwin' }, "x86_64-apple-darwin": { nodeArch: 'x64', platform: 'darwin' },
"aarch64-apple-darwin": { nodeArch: 'arm64', platform: 'darwin' }, "aarch64-apple-darwin": { nodeArch: 'arm64', platform: 'darwin' },
'x86_64-unknown-linux-musl': { nodeArch: 'x64', platform: 'linux' }, 'x86_64-unknown-linux-gnu': { nodeArch: 'x64', platform: 'linux' },
'aarch64-unknown-linux-musl': { nodeArch: 'arm64', platform: 'linux' }, 'aarch64-unknown-linux-gnu': { nodeArch: 'arm64', platform: 'linux' },
} }
// Ensure the dist directory exists // Ensure the dist directory exists

12
apps/desktop/desktop_native/napi/index.js
View File

@@ -88,20 +88,20 @@ switch (platform) {
switch (arch) { switch (arch) {
case "x64": case "x64":
nativeBinding = loadFirstAvailable( nativeBinding = loadFirstAvailable(
["desktop_napi.linux-x64-musl.node", "desktop_napi.linux-x64-gnu.node"], ["desktop_napi.linux-x64-gnu.node"],
"@bitwarden/desktop-napi-linux-x64-musl", "@bitwarden/desktop-napi-linux-x64-gnu",
); );
break; break;
case "arm64": case "arm64":
nativeBinding = loadFirstAvailable( nativeBinding = loadFirstAvailable(
["desktop_napi.linux-arm64-musl.node", "desktop_napi.linux-arm64-gnu.node"], ["desktop_napi.linux-arm64-gnu.node"],
"@bitwarden/desktop-napi-linux-arm64-musl", "@bitwarden/desktop-napi-linux-arm64-gnu",
); );
break; break;
case "arm": case "arm":
nativeBinding = loadFirstAvailable( nativeBinding = loadFirstAvailable(
["desktop_napi.linux-arm-musl.node", "desktop_napi.linux-arm-gnu.node"], ["desktop_napi.linux-arm-gnu.node"],
"@bitwarden/desktop-napi-linux-arm-musl", "@bitwarden/desktop-napi-linux-arm-gnu",
); );
localFileExisted = existsSync(join(__dirname, "desktop_napi.linux-arm-gnueabihf.node")); localFileExisted = existsSync(join(__dirname, "desktop_napi.linux-arm-gnueabihf.node"));
try { try {

11
apps/desktop/desktop_native/napi/package.json
View File

@@ -14,13 +14,12 @@
"napi": { "napi": {
"binaryName": "desktop_napi", "binaryName": "desktop_napi",
"targets": [ "targets": [
"x86_64-unknown-linux-musl",
"aarch64-unknown-linux-gnu",
"i686-pc-windows-msvc",
"armv7-unknown-linux-gnueabihf",
"aarch64-apple-darwin", "aarch64-apple-darwin",
"aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc",
"aarch64-pc-windows-msvc" "aarch64-unknown-linux-gnu",
"armv7-unknown-linux-gnueabihf",
"i686-pc-windows-msvc",
"x86_64-unknown-linux-gnu"
] ]
} }
} }