Skip to content

Commit

Permalink
update(core): added mac universal build (#1309)
Browse files Browse the repository at this point in the history 
* update(core): added mac universal build and updated release app names

* Update release-builds.yml

Signed-off-by: Harsh R <53080940+fullstackninja864@users.noreply.github.com>

---------

Signed-off-by: Harsh R <53080940+fullstackninja864@users.noreply.github.com>
  • Loading branch information
@fullstackninja864
fullstackninja864 committed Jun 22, 2024
1 parent 6355326 commit eb63a05
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "defi-wallet",
"version": "4.1.0",
"version": "4.1.1",
"description": "DeFi Wallet",
"main": "./electron-app/build/electron-app/index.js",
"author": {
Expand Down Expand Up @@ -166,9 +166,11 @@
"target": [
{
"target": "dmg",
"arch": ["x64", "arm64"]
"arch": ["x64", "arm64", "universal"]
}
],
"mergeASARs": true,
"x64ArchFiles": "*",
"type": "distribution",
"hardenedRuntime": true,
"entitlements": "electron-app/assets/entitlements.mac.plist",
Expand Down
2 changes: 1 addition & 1 deletion webapp/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webapp/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "defi-wallet",
"version": "4.1.0",
"version": "4.1.1",
"description": "DeFi Wallet",
"author": {
"name": "DeFiChain Foundation",
Expand Down

3 comments on commit eb63a05

@Martin8617
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @fullstackninja864
I see you have worked on the mac compilation. I do the same for the raspberry pi on linux basis.
The basis for the desktop app is the cli. So I use the [defichain-4.1.1-aarch64-linux-gnu.tar.gz] instead the [defichain-4.1.1-x86_64-pc-linux-gnu.tar.gz] for my raspberry pi compilation. The same is for mac with arm or x64 processor.

I recognized a problem while using the "arch": ["x64", "arm64", "universal"] in package.json for electron-app. I don't think it uses the different cli versions for building the different electron-app versions. I think it must be selected from ../scripts/prebuild.js -> x64 cli for x64 desktop app and arm cli for arm desktop app.

How I can discus this with you, because I'm not so familiar to work on an fork an publish it on BirthdayResearch or my be you can assist me?
I have done changes for myself and they work as I guess, but they are locally stored.
I like to work together with you and help you to release the desktop app in future for all platforms.

I'm looking forward to get your response.
Martin

@fullstackninja864
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Martin8617 , Thanks for reaching out and trying to fix this bug, Can you create PR for you changes, Our team will review it and merge if everything works as expected.

@Martin8617
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @fullstackninja864
As you may have seen, I opened PR #1310 and #1311.
If you have any question please come back to me.

Please sign in to comment.