mirror of
https://github.com/zadam/trilium.git
synced 2025-10-19 22:58:52 +02:00
Fix better-sqlite3 for ARM64 Linux
- Use ubuntu-24.04-arm for ARM64 Linux builds - Add TARGET_ARCH support to electron-rebuild - Add test workflow for ARM64 fix
This commit is contained in:
parent
982d136151
commit
2e510f9dbb
1
.github/actions/build-electron/action.yml
vendored
1
.github/actions/build-electron/action.yml
vendored
@ -86,6 +86,7 @@ runs:
|
||||
APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }}
|
||||
WINDOWS_SIGN_EXECUTABLE: ${{ env.WINDOWS_SIGN_EXECUTABLE }}
|
||||
TRILIUM_ARTIFACT_NAME_HINT: TriliumNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}
|
||||
TARGET_ARCH: ${{ inputs.arch }}
|
||||
run: pnpm run --filter desktop electron-forge:make --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }}
|
||||
|
||||
# Add DMG signing step
|
||||
|
11
.github/workflows/release.yml
vendored
11
.github/workflows/release.yml
vendored
@ -30,6 +30,17 @@ jobs:
|
||||
image: win-signing
|
||||
shell: cmd
|
||||
forge_platform: win32
|
||||
exclude:
|
||||
- arch: arm64
|
||||
os:
|
||||
name: linux
|
||||
include:
|
||||
- arch: arm64
|
||||
os:
|
||||
name: linux
|
||||
image: ubuntu-24.04-arm
|
||||
shell: bash
|
||||
forge_platform: linux
|
||||
runs-on: ${{ matrix.os.image }}
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
|
32
.github/workflows/test-arm64-fix.yml
vendored
Normal file
32
.github/workflows/test-arm64-fix.yml
vendored
Normal file
@ -0,0 +1,32 @@
|
||||
name: Test ARM64 Fix
|
||||
on:
|
||||
push:
|
||||
branches: [ fix-arm64-sqlite ]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
test-arm64-rebuild:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: pnpm/action-setup@v4
|
||||
- uses: actions/setup-node@v5
|
||||
with:
|
||||
node-version: 22
|
||||
cache: 'pnpm'
|
||||
- name: Install dependencies
|
||||
run: pnpm install --frozen-lockfile
|
||||
- name: Test rebuild with TARGET_ARCH
|
||||
env:
|
||||
TARGET_ARCH: arm64
|
||||
run: |
|
||||
echo "Testing electron-rebuild with TARGET_ARCH=arm64"
|
||||
pnpm postinstall
|
||||
echo "Checking better-sqlite3 architecture:"
|
||||
file apps/desktop/node_modules/better-sqlite3/build/Release/better_sqlite3.node || echo "File not found"
|
||||
- name: Test desktop build
|
||||
env:
|
||||
TARGET_ARCH: arm64
|
||||
run: |
|
||||
echo "Testing desktop build"
|
||||
pnpm run --filter desktop build
|
@ -24,13 +24,15 @@ function rebuildNativeDependencies(projectRoot: string) {
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`Rebuilding ${projectRoot} with ${electronVersion}...`);
|
||||
const targetArch = process.env.TARGET_ARCH || process.arch;
|
||||
console.log(`Rebuilding ${projectRoot} with ${electronVersion} for ${targetArch}...`);
|
||||
|
||||
const resolvedPath = resolve(projectRoot);
|
||||
rebuild({
|
||||
projectRootPath: resolvedPath,
|
||||
buildPath: resolvedPath,
|
||||
electronVersion,
|
||||
arch: targetArch,
|
||||
force: true
|
||||
});
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user