Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: appimage bundle fails due to incompatible binaries in linux, Fix mac m1 sign issues #174

Merged
merged 2 commits into from
Jan 15, 2024
Merged

fix: appimage bundle fails due to incompatible binaries in linux, Fix mac m1 sign issues #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43561d6
fix: appimage bundle fails due to incompatible binaries in linux
abose Jan 15, 2024
4c5862d
refactor: indentaion
abose Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/tauri-build-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ jobs:

# Sign the files specified in src-build/mac/filesToSign
while IFS= read -r file; do
if [ -f "$file" ]; then
codesign --sign "$APPLE_KEY_IDENTITY_NAME" --keychain build.keychain --timestamp --options runtime "$file"
else
echo "File to sign not found, ignoring: $file"
fi
done < src-build/mac/filesToSign

# Clean up
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tauri-build-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,11 @@ jobs:

# Sign the files specified in src-build/mac/filesToSign
while IFS= read -r file; do
if [ -f "$file" ]; then
codesign --sign "$APPLE_KEY_IDENTITY_NAME" --keychain build.keychain --timestamp --options runtime "$file"
else
echo "File to sign not found, ignoring: $file"
fi
done < src-build/mac/filesToSign

# Clean up
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tauri-build-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ jobs:

# Sign the files specified in src-build/mac/filesToSign
while IFS= read -r file; do
if [ -f "$file" ]; then
codesign --sign "$APPLE_KEY_IDENTITY_NAME" --keychain build.keychain --timestamp --options runtime "$file"
else
echo "File to sign not found, ignoring: $file"
fi
done < src-build/mac/filesToSign

# Clean up
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"releaseDistDebug": "npm run _make_src-node && npm run _createDistReleaseConfig && tauri build --config ./src-tauri/tauri-local.conf.json --debug",
"releaseDistTest": "npm run _make_src-node && npm run _createDistTestReleaseConfig && tauri build --config ./src-tauri/tauri-local.conf.json",
"releaseDistTestDebug": "npm run _make_src-node && npm run _createDistTestReleaseConfig && tauri build --config ./src-tauri/tauri-local.conf.json --debug",
"_src-node_npm_install": "cd src-tauri/src-node && npm ci --production && cd ../../",
"_src-node_npm_install": "cd src-tauri/src-node && npm ci --production && cd ../../ && npm run _src-node_remove_unsupported_bin",
"_src-node_remove_unsupported_bin": "shx rm -f src-tauri/src-node/node_modules/@msgpackr-extract/msgpackr-extract-linux-*/*.musl.node src-tauri/src-node/node_modules/@lmdb/lmdb-linux-*/*.musl.node",
"_make_src-node": "shx rm -rf src-tauri/src-node && shx cp -r ../phoenix/src-node src-tauri/src-node && npm run _src-node_npm_install",
"_make_src-node_debug_dev": "npm run _make_src-node && shx rm -rf src-tauri/target/debug/src-node && shx cp -r src-tauri/src-node src-tauri/target/debug/src-node",
"_ci_make_src-node": "shx rm -rf src-tauri/src-node && shx cp -r phoenix/src-node src-tauri/src-node && npm run _src-node_npm_install",
Expand Down
5 changes: 5 additions & 0 deletions src-build/mac/filesToSign
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
src-tauri/src-node/node_modules/fsevents/fsevents.node
src-tauri/src-node/node_modules/@lmdb/lmdb-darwin-x64/node.napi.node
src-tauri/src-node/node_modules/@lmdb/lmdb-darwin-arm64/node.napi.node
src-tauri/src-node/node_modules/@lmdb/lmdb-darwin-x64/node.abi108.node
src-tauri/src-node/node_modules/@lmdb/lmdb-darwin-arm64/node.abi108.node
src-tauri/src-node/node_modules/@lmdb/lmdb-darwin-x64/node.abi115.node
src-tauri/src-node/node_modules/@lmdb/lmdb-darwin-arm64/node.abi115.node
src-tauri/src-node/node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64/node.abi108.glibc.node
src-tauri/src-node/node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64/node.abi108.glibc.node
src-tauri/src-node/node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64/node.napi.glibc.node
src-tauri/src-node/node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64/node.napi.glibc.node
Loading