mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 19:49:01 +01:00 
			
		
		
		
	Fix(build): Fix the issue that on ARM64 Linux failed to launch due to missing better_sqlite3.node (#7002)
This commit is contained in:
		
						commit
						23b798e392
					
				
							
								
								
									
										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 | ||||
|  | ||||
							
								
								
									
										13
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @ -30,6 +30,19 @@ jobs: | ||||
|             image: win-signing | ||||
|             shell: cmd | ||||
|             forge_platform: win32 | ||||
|         # Exclude ARM64 Linux from default matrix to use native runner | ||||
|         exclude: | ||||
|           - arch: arm64 | ||||
|             os: | ||||
|               name: linux | ||||
|         # Add ARM64 Linux with native ubuntu-24.04-arm runner for better-sqlite3 compatibility | ||||
|         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 | ||||
|  | ||||
| @ -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
	 Elian Doran
						Elian Doran