diff --git a/.github/workflows/publish-nym-wallet-macos.yml b/.github/workflows/publish-nym-wallet-macos.yml index 40077d2069..037cc68820 100644 --- a/.github/workflows/publish-nym-wallet-macos.yml +++ b/.github/workflows/publish-nym-wallet-macos.yml @@ -31,10 +31,12 @@ jobs: uses: actions/setup-node@v4 with: node-version: 21 + - name: Install Rust stable uses: actions-rs/toolchain@v1 with: toolchain: stable + - name: Install the Apple developer certificate for code signing env: APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} @@ -64,11 +66,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,27 +96,29 @@ 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 if: ${{ always() }} run: | security delete-keychain $RUNNER_TEMP/app-signing.keychain-db + - id: create-release name: Upload to release based on tag name uses: softprops/action-gh-release@v2 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 +126,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 diff --git a/nym-wallet/package.json b/nym-wallet/package.json index af6580bc0d..d9534c4a21 100644 --- a/nym-wallet/package.json +++ b/nym-wallet/package.json @@ -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", diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml index 19bc4f130e..54bddba346 100644 --- a/nym-wallet/src-tauri/Cargo.toml +++ b/nym-wallet/src-tauri/Cargo.toml @@ -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" } diff --git a/nym-wallet/src-tauri/tauri.conf.json b/nym-wallet/src-tauri/tauri.conf.json index ba7704c0fd..a1e64c03b2 100644 --- a/nym-wallet/src-tauri/tauri.conf.json +++ b/nym-wallet/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "nym-wallet", - "version": "1.2.16" + "version": "1.2.17" }, "build": { "distDir": "../dist",