Compare commits

...

15 Commits

Author SHA1 Message Date
benedettadavico b8ca79fad9 update package.json 2025-04-04 09:14:26 +02:00
benedetta davico 4f115172d9 Revert and add different fixes 2025-04-04 08:57:55 +02:00
benedetta davico 3b3af01b79 add yarn 2025-04-03 10:30:22 +02:00
benedettadavico 829635d7be update path 2025-04-02 18:51:49 +02:00
benedettadavico 88b878b16c bump wallet version again 2025-04-02 18:45:59 +02:00
Rokas Ambrazevicius 9798dc8b8e Revert silicon changes 2025-04-02 19:25:31 +03:00
Rokas Ambrazevicius fad1be5591 Build x86 only 2025-04-02 19:12:16 +03:00
benedettadavico d34e3bf697 new approach! 2025-04-02 13:43:47 +02:00
benedetta davico f9314ae19a trialing different things 2025-04-02 13:08:43 +02:00
benedetta davico 61fe520688 add env var 2025-04-02 13:02:38 +02:00
benedetta davico 540a75029e typo 2025-04-02 12:47:51 +02:00
benedetta davico 26efc60418 use brndnmtthws/rust-action-rustup@v1 2025-04-02 12:45:11 +02:00
benedetta davico 053d114384 update override and default 2025-04-02 12:24:53 +02:00
benedetta davico 205d756b0c typo 2025-04-02 12:11:59 +02:00
benedettadavico 663dd2f135 add target 2025-04-02 12:04:31 +02:00
4 changed files with 27 additions and 9 deletions
+21 -6
View File
@@ -64,11 +64,25 @@ jobs:
fileName: '.env'
encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
- name: Add Rust target for x86_64-apple-darwin
run: rustup target add x86_64-apple-darwin
- name: Set Cargo build target to x86_64
run: echo "CARGO_BUILD_TARGET=x86_64-apple-darwin" >> $GITHUB_ENV
- name: yarn cache clean
shell: bash
run: cd .. && yarn cache clean
- name: Install project dependencies
shell: bash
run: cd .. && yarn --network-timeout 100000
- name: Install app dependencies and build it
- name: yarn build
shell: bash
run: cd .. && yarn build
- name: Install dependencies and build it
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
@@ -80,13 +94,14 @@ jobs:
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
run: yarn && yarn build
run: |
yarn build-macx86
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: nym-wallet.app.tar.gz
path: nym-wallet/target/release/bundle/macos/nym-wallet.app.tar.gz
path: nym-wallet/target/x86_64-apple-darwin/release/bundle/macos/nym-wallet.app.tar.gz
retention-days: 5
- name: Clean up keychain
@@ -99,8 +114,8 @@ jobs:
if: github.event_name == 'release'
with:
files: |
nym-wallet/target/release/bundle/dmg/*.dmg
nym-wallet/target/release/bundle/macos/*.app.tar.gz*
nym-wallet/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg
nym-wallet/target/x86_64-apple-darwin/release/bundle/macos/*.app.tar.gz*
- name: Deploy artifacts to CI www
continue-on-error: true
@@ -108,7 +123,7 @@ jobs:
env:
SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
ARGS: "-avzr"
SOURCE: "nym-wallet/target/release/bundle/macos/nym-wallet.app.tar.gz"
SOURCE: "nym-wallet/target/x86_64-apple-darwin/release/bundle/macos/nym-wallet.app.tar.gz"
REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/${{ github.ref_name }}/nym-wallet
+3 -1
View File
@@ -1,11 +1,12 @@
{
"name": "@nymproject/nym-wallet-app",
"version": "1.2.16",
"version": "1.2.17",
"license": "MIT",
"main": "index.js",
"scripts": {
"build": "run-s webpack:prod tauri:build",
"dev": "run-p tauri:dev webpack:dev",
"build-macx86": "run-s webpack:prod tauri:buildx86",
"lint": "eslint src",
"lint:fix": "eslint src --fix",
"prebuild": "yarn --cwd .. build",
@@ -14,6 +15,7 @@
"storybook": "start-storybook -p 6006",
"storybook:build": "build-storybook",
"tauri:build": "yarn tauri build",
"tauri:buildx86": "yarn tauri build --target x86_64-apple-darwin",
"tauri:dev": "yarn tauri dev",
"tsc": "tsc --noEmit true",
"tsc:watch": "tsc --noEmit true --watch",
+2 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nym_wallet"
version = "1.2.16"
version = "1.2.17"
description = "Nym Native Wallet"
authors = ["Nym Technologies SA"]
license = ""
@@ -48,6 +48,7 @@ url = "2.2"
k256 = { version = "0.13", features = ["ecdsa", "sha256"] }
base64 = "0.13"
zeroize = { version = "1.5", features = ["zeroize_derive", "serde"] }
plist = "1.6.0"
cosmwasm-std = "2.2.1"
cosmrs = { version = "0.21.0" }
+1 -1
View File
@@ -1,7 +1,7 @@
{
"package": {
"productName": "nym-wallet",
"version": "1.2.16"
"version": "1.2.17"
},
"build": {
"distDir": "../dist",