From a71e228a252c73a01ddf50a2cc0ef41205d0f4b0 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 09:34:35 +0100 Subject: [PATCH 01/29] Add wasm-pack install to GitHub Actions --- .github/workflows/nym-wallet-publish-macos.yml | 2 ++ .github/workflows/nym-wallet-publish-ubuntu.yml | 3 +++ .github/workflows/nym-wallet-publish-windows10.yml | 4 +++- .github/workflows/nym-wallet-storybook.yml | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nym-wallet-publish-macos.yml b/.github/workflows/nym-wallet-publish-macos.yml index 81c27a8338..9df72181b6 100644 --- a/.github/workflows/nym-wallet-publish-macos.yml +++ b/.github/workflows/nym-wallet-publish-macos.yml @@ -28,6 +28,8 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable + - name: Install wasm-pack + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Install the Apple developer certificate for code signing env: APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} diff --git a/.github/workflows/nym-wallet-publish-ubuntu.yml b/.github/workflows/nym-wallet-publish-ubuntu.yml index 1f2bb0330d..e9470ffcea 100644 --- a/.github/workflows/nym-wallet-publish-ubuntu.yml +++ b/.github/workflows/nym-wallet-publish-ubuntu.yml @@ -34,6 +34,9 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable + - name: Install wasm-pack + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + - name: Install app dependencies run: yarn - name: Create env file diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 044816953b..b9934bd1ff 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -48,7 +48,9 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable - + - name: Install wasm-pack + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + - name: Create env file uses: timheuer/base64-to-file@v1.1 with: diff --git a/.github/workflows/nym-wallet-storybook.yml b/.github/workflows/nym-wallet-storybook.yml index 88f1230895..99eb4ce262 100644 --- a/.github/workflows/nym-wallet-storybook.yml +++ b/.github/workflows/nym-wallet-storybook.yml @@ -19,6 +19,12 @@ jobs: node-version: 18 - name: Setup yarn run: npm install -g yarn + - name: Install Rust stable + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: Install wasm-pack + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Build dependencies run: yarn && yarn build - name: Build storybook From 11ed3b3e45fbf24b02958ce5a29c035ecca396cf Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 11:33:05 +0100 Subject: [PATCH 02/29] GitHub Actions: run Windows steps that use `yarn` in `bash` --- .github/workflows/nym-connect-publish-windows10.yml | 2 ++ .github/workflows/nym-wallet-publish-windows10.yml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/nym-connect-publish-windows10.yml b/.github/workflows/nym-connect-publish-windows10.yml index 4a869caf3e..d85b151e16 100644 --- a/.github/workflows/nym-connect-publish-windows10.yml +++ b/.github/workflows/nym-connect-publish-windows10.yml @@ -56,9 +56,11 @@ jobs: encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} - name: Install app dependencies + shell: bash run: yarn --network-timeout 100000 - name: Build and sign it + shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }} diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index b9934bd1ff..0028074f01 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -45,6 +45,7 @@ jobs: node-version: 18 - name: Install Rust stable + shell: bash uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -58,9 +59,11 @@ jobs: encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} - name: Install app dependencies + shell: bash run: yarn --network-timeout 100000 - name: Build and sign it + shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }} From f95b9b7f4a7d02fdd03506cc9a7bac95b189c27f Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 11:37:00 +0100 Subject: [PATCH 03/29] Add `preinstall` targets to some `package.json` files to build pre-requisites --- nym-wallet/package.json | 3 ++- package.json | 4 ++-- sdk/typescript/packages/sdk/package.json | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nym-wallet/package.json b/nym-wallet/package.json index d6c7cdf442..ad02b9a010 100644 --- a/nym-wallet/package.json +++ b/nym-wallet/package.json @@ -18,7 +18,8 @@ "lint:fix": "eslint src --fix", "prestorybook": "yarn --cwd .. build", "storybook": "start-storybook -p 6006", - "storybook:build": "build-storybook" + "storybook:build": "build-storybook", + "preinstall": "yarn --cwd .. build" }, "dependencies": { "@emotion/react": "^11.7.0", diff --git a/package.json b/package.json index 58d32165d3..627359351b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "build": "run-s build:types build:packages", "build:types": "lerna run --scope @nymproject/types build --stream", "build:packages": "run-s build:packages:theme build:packages:react build:packages:sdk", - "build:packages:sdk": "lerna run --scope @nymproject/sdk build:lint", + "build:packages:sdk": "lerna run --scope @nymproject/sdk build:local", "build:packages:theme": "lerna run --scope @nymproject/mui-theme build", "build:packages:react": "lerna run --scope @nymproject/react build", "build:react-example": "lerna run --scope @nymproject/react-webpack-with-theme-example build --stream", @@ -29,7 +29,7 @@ "tsc": "lerna run tsc --stream", "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app", "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run", - "preinstall": "yarn install:copy-placeholders", + "preinstall": "run-s install:copy-placeholders", "install:copy-placeholders": "cp scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" }, "devDependencies": { diff --git a/sdk/typescript/packages/sdk/package.json b/sdk/typescript/packages/sdk/package.json index 7b2b512f37..14a9b02e79 100644 --- a/sdk/typescript/packages/sdk/package.json +++ b/sdk/typescript/packages/sdk/package.json @@ -27,7 +27,8 @@ "prebuild:dev": "yarn build:dependencies", "build:dev": "yarn build:dev:only-this", "build:dev:only-this": "scripts/build.sh", - "build:lint": "run-s build:dependencies:nym-client-wasm build:dev:only-this" + "build:local": "run-s build:dependencies:nym-client-wasm build:dev:only-this", + "preinstall": "yarn build:local" }, "dependencies": { "@npmcli/node-gyp": "^3.0.0", From b134334ec77aa1cae91acdce7411cdd71282ed68 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 11:43:42 +0100 Subject: [PATCH 04/29] Fix package.json `preinstall` error --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 627359351b..49e9e5f8b2 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "tsc": "lerna run tsc --stream", "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app", "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run", - "preinstall": "run-s install:copy-placeholders", + "preinstall": "yarn install:copy-placeholders", "install:copy-placeholders": "cp scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" }, "devDependencies": { From 2e366a094d041eb533ffe2e6a9027060b4e232c7 Mon Sep 17 00:00:00 2001 From: Mark Sinclair <14054343+mmsinclair@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:52:13 +0100 Subject: [PATCH 05/29] Update nym-wallet-publish-windows10.yml --- .github/workflows/nym-wallet-publish-windows10.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 0028074f01..7a8fc79f7f 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -45,11 +45,11 @@ jobs: node-version: 18 - name: Install Rust stable - shell: bash uses: actions-rs/toolchain@v1 with: toolchain: stable - name: Install wasm-pack + shell: bash run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Create env file From 730f03de30b415b291f852c5ec50caf14a6d854d Mon Sep 17 00:00:00 2001 From: Mark Sinclair <14054343+mmsinclair@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:54:46 +0100 Subject: [PATCH 06/29] Update nym-wallet-publish-windows10.yml --- .github/workflows/nym-wallet-publish-windows10.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 7a8fc79f7f..274327ff90 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -49,8 +49,7 @@ jobs: with: toolchain: stable - name: Install wasm-pack - shell: bash - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + run: cargo install wasm-pack - name: Create env file uses: timheuer/base64-to-file@v1.1 From 16d6444169ff033e5894fc644ce4f36cfae2497a Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 15:30:49 +0100 Subject: [PATCH 07/29] Add GH Actions workflow to publish the SDK --- .github/workflows/sdk-publish.yml | 32 +++++++++++++++++++ sdk/typescript/packages/sdk/DEVELOPERS.md | 10 ++++++ sdk/typescript/packages/sdk/package.json | 2 +- .../packages/sdk/scripts/publish.sh | 22 +++++++++++++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/sdk-publish.yml create mode 100755 sdk/typescript/packages/sdk/scripts/publish.sh diff --git a/.github/workflows/sdk-publish.yml b/.github/workflows/sdk-publish.yml new file mode 100644 index 0000000000..8cabbfe978 --- /dev/null +++ b/.github/workflows/sdk-publish.yml @@ -0,0 +1,32 @@ +name: Publish SDK to NPM +on: + workflow_dispatch: + +defaults: + run: + working-directory: sdk/typescript/packages/sdk + +jobs: + publish: + runs-on: [custom-runner-linux] + steps: + - name: Install Node + uses: actions/setup-node@v3 + with: + node-version: 18 + + - name: Setup yarn + run: npm install -g yarn + + - name: Install Rust stable + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: Install wasm-pack + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + + - name: Build and publish + env: + NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }} + run: scripts/publish.sh \ No newline at end of file diff --git a/sdk/typescript/packages/sdk/DEVELOPERS.md b/sdk/typescript/packages/sdk/DEVELOPERS.md index 015271fb96..5215673a2b 100644 --- a/sdk/typescript/packages/sdk/DEVELOPERS.md +++ b/sdk/typescript/packages/sdk/DEVELOPERS.md @@ -34,6 +34,16 @@ The output bundle will be created in the `dist` directory. If you're a Nym platform developer who's made changes to the Rust (or JS) files and wants to re-publish the package to NPM, here's how you do it: +Make sure you have logged into the NPM registry (`npm login`). + +### Scripted + +1. bump version numbers as necessary for SemVer +2. make sure you're in the SDK directory (`cd sdk/typescript/packages/sdk`) +3. run `scripts/publish.sh` + +### Manually + 1. bump version numbers as necessary for SemVer 2. `yarn build` builds the release directory in the root of the repo in `dist/sdk` 3. `cd ../../../../dist/sdk` diff --git a/sdk/typescript/packages/sdk/package.json b/sdk/typescript/packages/sdk/package.json index 14a9b02e79..5e661b79c3 100644 --- a/sdk/typescript/packages/sdk/package.json +++ b/sdk/typescript/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nymproject/sdk", - "version": "1.1.7", + "version": "1.1.8", "license": "Apache-2.0", "author": "Nym Technologies SA", "type": "module", diff --git a/sdk/typescript/packages/sdk/scripts/publish.sh b/sdk/typescript/packages/sdk/scripts/publish.sh new file mode 100755 index 0000000000..94aa4f689b --- /dev/null +++ b/sdk/typescript/packages/sdk/scripts/publish.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +rm -rf dist || true +rm -rf ../../../../dist || true + +yarn +yarn build +cd ../../../../dist/sdk + +cd cjs +echo "Publishing CommonJS package to NPM.." +npm publish --access=public +cd .. + +cd esm +echo "Publishing ESM package to NPM.." +npm publish --access=public +cd .. From 9e0bcc025fb01d3d1d3ecf2f99b1c89cd184438b Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 15:34:37 +0100 Subject: [PATCH 08/29] Fix up working directory in GH Action to publish to NPM --- .github/workflows/sdk-publish.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sdk-publish.yml b/.github/workflows/sdk-publish.yml index 8cabbfe978..7622a6bf17 100644 --- a/.github/workflows/sdk-publish.yml +++ b/.github/workflows/sdk-publish.yml @@ -2,10 +2,6 @@ name: Publish SDK to NPM on: workflow_dispatch: -defaults: - run: - working-directory: sdk/typescript/packages/sdk - jobs: publish: runs-on: [custom-runner-linux] @@ -29,4 +25,5 @@ jobs: - name: Build and publish env: NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }} - run: scripts/publish.sh \ No newline at end of file + working-directory: ./sdk/typescript/packages/sdk + run: cd sdk/typescript/packages/sdk && scripts/publish.sh \ No newline at end of file From 4899ccf4eff08551b6f3c3cec7c9853c3734d65c Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 15:36:26 +0100 Subject: [PATCH 09/29] GitHub Action to publish SDK --- .github/workflows/sdk-publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sdk-publish.yml b/.github/workflows/sdk-publish.yml index 7622a6bf17..75eb7e512d 100644 --- a/.github/workflows/sdk-publish.yml +++ b/.github/workflows/sdk-publish.yml @@ -6,6 +6,8 @@ jobs: publish: runs-on: [custom-runner-linux] steps: + - uses: actions/checkout@v2 + - name: Install Node uses: actions/setup-node@v3 with: From adbeeb3e5f3ba2a997819cfdbc920d86a5ea7dc4 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 15:39:11 +0100 Subject: [PATCH 10/29] GitHub Action to publish SDK --- .github/workflows/sdk-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdk-publish.yml b/.github/workflows/sdk-publish.yml index 75eb7e512d..db78b453c5 100644 --- a/.github/workflows/sdk-publish.yml +++ b/.github/workflows/sdk-publish.yml @@ -28,4 +28,4 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }} working-directory: ./sdk/typescript/packages/sdk - run: cd sdk/typescript/packages/sdk && scripts/publish.sh \ No newline at end of file + run: scripts/publish.sh \ No newline at end of file From 578765321095e380b3bc700b703298b71b011b4b Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 15:40:45 +0100 Subject: [PATCH 11/29] GitHub Action to publish SDK --- .github/workflows/sdk-publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sdk-publish.yml b/.github/workflows/sdk-publish.yml index db78b453c5..b38fff9d26 100644 --- a/.github/workflows/sdk-publish.yml +++ b/.github/workflows/sdk-publish.yml @@ -24,6 +24,9 @@ jobs: - name: Install wasm-pack run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + - name: Install dependencies + run: yarn + - name: Build and publish env: NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }} From a91c997aedc64de91092a55ba0ce5970dbb2eab4 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 15:48:44 +0100 Subject: [PATCH 12/29] Revert building SDK from root package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 49e9e5f8b2..cad6eaf88d 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,7 @@ "clean": "lerna run clean", "build": "run-s build:types build:packages", "build:types": "lerna run --scope @nymproject/types build --stream", - "build:packages": "run-s build:packages:theme build:packages:react build:packages:sdk", - "build:packages:sdk": "lerna run --scope @nymproject/sdk build:local", + "build:packages": "run-s build:packages:theme build:packages:react", "build:packages:theme": "lerna run --scope @nymproject/mui-theme build", "build:packages:react": "lerna run --scope @nymproject/react build", "build:react-example": "lerna run --scope @nymproject/react-webpack-with-theme-example build --stream", From 2d7003dfae1b9b4a993f009d7fce0d48d3db0419 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 16:06:55 +0100 Subject: [PATCH 13/29] Add npm registry to setup-node to create `.npmrc` file with reg details --- .github/workflows/sdk-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdk-publish.yml b/.github/workflows/sdk-publish.yml index b38fff9d26..7ef5f90b1b 100644 --- a/.github/workflows/sdk-publish.yml +++ b/.github/workflows/sdk-publish.yml @@ -12,6 +12,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18 + registry-url: 'https://registry.npmjs.org' - name: Setup yarn run: npm install -g yarn From 3051d84e8d47cb3bd34a4e21809cc1632e99db08 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 16:59:57 +0100 Subject: [PATCH 14/29] Revert GitHub Action changes to add wasm-pack to Typescript workflows --- .github/workflows/build-ts-packages.yml | 6 ------ .github/workflows/nym-wallet-publish-macos.yml | 2 -- .github/workflows/nym-wallet-publish-ubuntu.yml | 2 -- .github/workflows/nym-wallet-publish-windows10.yml | 6 +----- .github/workflows/nym-wallet-storybook.yml | 6 ------ .github/workflows/typescript-lint.yml | 6 ------ 6 files changed, 1 insertion(+), 27 deletions(-) diff --git a/.github/workflows/build-ts-packages.yml b/.github/workflows/build-ts-packages.yml index 1fb210bd8e..7c0ead8933 100644 --- a/.github/workflows/build-ts-packages.yml +++ b/.github/workflows/build-ts-packages.yml @@ -19,12 +19,6 @@ jobs: node-version: 18 - name: Setup yarn run: npm install -g yarn - - name: Install Rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Build run: yarn && yarn build && yarn build:ci - name: Deploy branch to CI www (storybook) diff --git a/.github/workflows/nym-wallet-publish-macos.yml b/.github/workflows/nym-wallet-publish-macos.yml index 9df72181b6..81c27a8338 100644 --- a/.github/workflows/nym-wallet-publish-macos.yml +++ b/.github/workflows/nym-wallet-publish-macos.yml @@ -28,8 +28,6 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable - - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Install the Apple developer certificate for code signing env: APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} diff --git a/.github/workflows/nym-wallet-publish-ubuntu.yml b/.github/workflows/nym-wallet-publish-ubuntu.yml index e9470ffcea..db61b24805 100644 --- a/.github/workflows/nym-wallet-publish-ubuntu.yml +++ b/.github/workflows/nym-wallet-publish-ubuntu.yml @@ -34,8 +34,6 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable - - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Install app dependencies run: yarn diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 274327ff90..044816953b 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -48,9 +48,7 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable - - name: Install wasm-pack - run: cargo install wasm-pack - + - name: Create env file uses: timheuer/base64-to-file@v1.1 with: @@ -58,11 +56,9 @@ jobs: encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} - name: Install app dependencies - shell: bash run: yarn --network-timeout 100000 - name: Build and sign it - shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }} diff --git a/.github/workflows/nym-wallet-storybook.yml b/.github/workflows/nym-wallet-storybook.yml index 99eb4ce262..88f1230895 100644 --- a/.github/workflows/nym-wallet-storybook.yml +++ b/.github/workflows/nym-wallet-storybook.yml @@ -19,12 +19,6 @@ jobs: node-version: 18 - name: Setup yarn run: npm install -g yarn - - name: Install Rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Build dependencies run: yarn && yarn build - name: Build storybook diff --git a/.github/workflows/typescript-lint.yml b/.github/workflows/typescript-lint.yml index b473107386..829ffb22e9 100644 --- a/.github/workflows/typescript-lint.yml +++ b/.github/workflows/typescript-lint.yml @@ -38,12 +38,6 @@ jobs: node-version: 18 - name: Setup yarn run: npm install -g yarn - - name: Install Rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Install run: yarn - name: Build packages From 58958a2449ecfce02f0ab198c9a001169a7a01b4 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 17:01:05 +0100 Subject: [PATCH 15/29] nym-wallet: use NPM published package and add `-rc0` prefix to workspace SDK package --- nym-wallet/package.json | 5 ++--- sdk/typescript/packages/sdk/DEVELOPERS.md | 3 +++ sdk/typescript/packages/sdk/package.json | 2 +- yarn.lock | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/nym-wallet/package.json b/nym-wallet/package.json index ad02b9a010..f14d6dd227 100644 --- a/nym-wallet/package.json +++ b/nym-wallet/package.json @@ -18,8 +18,7 @@ "lint:fix": "eslint src --fix", "prestorybook": "yarn --cwd .. build", "storybook": "start-storybook -p 6006", - "storybook:build": "build-storybook", - "preinstall": "yarn --cwd .. build" + "storybook:build": "build-storybook" }, "dependencies": { "@emotion/react": "^11.7.0", @@ -32,7 +31,7 @@ "@nymproject/mui-theme": "^1.0.0", "@nymproject/react": "^1.0.0", "@nymproject/types": "^1.0.0", - "@nymproject/sdk": "1", + "@nymproject/sdk": "^1.1.8", "@storybook/react": "^6.5.15", "@tauri-apps/api": "^1.2.0", "@tauri-apps/tauri-forage": "^1.0.0-beta.2", diff --git a/sdk/typescript/packages/sdk/DEVELOPERS.md b/sdk/typescript/packages/sdk/DEVELOPERS.md index 5215673a2b..c8a19f360f 100644 --- a/sdk/typescript/packages/sdk/DEVELOPERS.md +++ b/sdk/typescript/packages/sdk/DEVELOPERS.md @@ -55,3 +55,6 @@ Publish the CJS package: Publish the ESM package: - `cd ../esm` - `npm publish --access=public` will publish your changed package to NPM + +4. bump the minor version and add `-rc0` to avoid local packages from using the workspace SDK, e.g. (`1.1.10` -> `1.1.11-rc0`) +5. commit the updated `package.json` to git diff --git a/sdk/typescript/packages/sdk/package.json b/sdk/typescript/packages/sdk/package.json index 5e661b79c3..617752ebfb 100644 --- a/sdk/typescript/packages/sdk/package.json +++ b/sdk/typescript/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@nymproject/sdk", - "version": "1.1.8", + "version": "1.1.9-rc0", "license": "Apache-2.0", "author": "Nym Technologies SA", "type": "module", diff --git a/yarn.lock b/yarn.lock index 197fe4355b..2eb29a1a15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2838,6 +2838,11 @@ "@cosmjs/stargate" "^0.25.5" axios "^0.21.1" +"@nymproject/sdk@^1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@nymproject/sdk/-/sdk-1.1.8.tgz#384ee824971dee413755b14634c3d60fb22eff9a" + integrity sha512-nAyem2wqTfc6l9e6Y7JR2V1teDfwjxMHpRjxg90FMkUWl/JP7Ww752gDsSq3nvObLt+cvxjWMHy1mswvwQfZyQ== + "@octokit/auth-token@^3.0.0": version "3.0.4" resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.4.tgz#70e941ba742bdd2b49bdb7393e821dea8520a3db" From 847f3a0ecce9ab24a177a8c9a9346df9b36cb010 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 17:03:24 +0100 Subject: [PATCH 16/29] Remove preinstall target that needs wasm-pack --- sdk/typescript/packages/sdk/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/typescript/packages/sdk/package.json b/sdk/typescript/packages/sdk/package.json index 617752ebfb..de6d16554d 100644 --- a/sdk/typescript/packages/sdk/package.json +++ b/sdk/typescript/packages/sdk/package.json @@ -27,8 +27,7 @@ "prebuild:dev": "yarn build:dependencies", "build:dev": "yarn build:dev:only-this", "build:dev:only-this": "scripts/build.sh", - "build:local": "run-s build:dependencies:nym-client-wasm build:dev:only-this", - "preinstall": "yarn build:local" + "build:local": "run-s build:dependencies:nym-client-wasm build:dev:only-this" }, "dependencies": { "@npmcli/node-gyp": "^3.0.0", From 351552b8636d02dccb52f5b9900ce11b82ac4f34 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 17:22:54 +0100 Subject: [PATCH 17/29] Add back preinstall target --- nym-wallet/package.json | 3 ++- package.json | 6 ++++- yarn.lock | 54 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/nym-wallet/package.json b/nym-wallet/package.json index f14d6dd227..36c3ca5017 100644 --- a/nym-wallet/package.json +++ b/nym-wallet/package.json @@ -18,7 +18,8 @@ "lint:fix": "eslint src --fix", "prestorybook": "yarn --cwd .. build", "storybook": "start-storybook -p 6006", - "storybook:build": "build-storybook" + "storybook:build": "build-storybook", + "preinstall": "yarn --cwd .. setup:dependencies" }, "dependencies": { "@emotion/react": "^11.7.0", diff --git a/package.json b/package.json index cad6eaf88d..cc37b9438d 100644 --- a/package.json +++ b/package.json @@ -29,10 +29,14 @@ "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app", "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run", "preinstall": "yarn install:copy-placeholders", - "install:copy-placeholders": "cp scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" + "setup:dependencies": "yarn install:copy-placeholders", + "install:copy-placeholders": "copyfiles -V -s -f scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" }, "devDependencies": { "lerna": "^6.6.2", "npm-run-all": "^4.1.5" + }, + "dependencies": { + "copyfiles": "^2.4.1" } } diff --git a/yarn.lock b/yarn.lock index 2eb29a1a15..235fc7d7a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7823,6 +7823,19 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== +copyfiles@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5" + integrity sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg== + dependencies: + glob "^7.0.5" + minimatch "^3.0.3" + mkdirp "^1.0.4" + noms "0.0.0" + through2 "^2.0.1" + untildify "^4.0.0" + yargs "^16.1.0" + core-js-compat@^3.30.1, core-js-compat@^3.30.2, core-js-compat@^3.8.1: version "3.31.0" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1" @@ -10615,7 +10628,7 @@ glob@^10.2.2: minipass "^5.0.0 || ^6.0.2" path-scurry "^1.10.0" -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -12000,6 +12013,11 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== + isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -14208,7 +14226,7 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -14705,6 +14723,14 @@ nodemon@^2.0.21: touch "^3.1.0" undefsafe "^2.0.5" +noms@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859" + integrity sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow== + dependencies: + inherits "^2.0.1" + readable-stream "~1.0.31" + nopt@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" @@ -16963,6 +16989,16 @@ readable-stream@^4.1.0: events "^3.3.0" process "^0.11.10" +readable-stream@~1.0.31: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -18324,6 +18360,11 @@ string_decoder@^1.0.0, string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -18756,7 +18797,7 @@ throat@^6.0.1: resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.2.tgz#51a3fbb5e11ae72e2cf74861ed5c8020f89f29fe" integrity sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ== -through2@^2.0.0: +through2@^2.0.0, through2@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -19492,6 +19533,11 @@ untildify@^2.0.0: dependencies: os-homedir "^1.0.0" +untildify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" + integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== + upath@2.0.1, upath@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" @@ -20420,7 +20466,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.2.0: +yargs@16.2.0, yargs@^16.1.0, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From 879e3246963517e4d2e7f1be08171460e3387ee6 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 17:26:41 +0100 Subject: [PATCH 18/29] Add another target for install and CI --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cc37b9438d..ec9de014c0 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,9 @@ "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app", "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run", "preinstall": "yarn install:copy-placeholders", - "setup:dependencies": "yarn install:copy-placeholders", - "install:copy-placeholders": "copyfiles -V -s -f scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" + "setup:dependencies": "yarn install:copy-placeholders:crossplatform", + "install:copy-placeholders": "cp scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm", + "install:copy-placeholders:crossplatform": "copyfiles -V -s -f scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" }, "devDependencies": { "lerna": "^6.6.2", From 57e2628928fe30c84543f87f3d686c5ca02289c9 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 17:32:32 +0100 Subject: [PATCH 19/29] GitHub Actions adding `bash` to Windows publish workflow --- .github/workflows/nym-wallet-publish-windows10.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 044816953b..48fb9a301c 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -56,9 +56,11 @@ jobs: encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} - name: Install app dependencies + shell: bash run: yarn --network-timeout 100000 - name: Build and sign it + shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }} From 136f4a8473222add00bd07c2e96f4e802db35b2b Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 17:42:36 +0100 Subject: [PATCH 20/29] Revert adding copyfiles --- package.json | 8 ++------ yarn.lock | 54 ++++------------------------------------------------ 2 files changed, 6 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index ec9de014c0..c796364c77 100644 --- a/package.json +++ b/package.json @@ -29,15 +29,11 @@ "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app", "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run", "preinstall": "yarn install:copy-placeholders", - "setup:dependencies": "yarn install:copy-placeholders:crossplatform", - "install:copy-placeholders": "cp scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm", - "install:copy-placeholders:crossplatform": "copyfiles -V -s -f scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" + "setup:dependencies": "yarn install:copy-placeholders", + "install:copy-placeholders": "cp scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" }, "devDependencies": { "lerna": "^6.6.2", "npm-run-all": "^4.1.5" - }, - "dependencies": { - "copyfiles": "^2.4.1" } } diff --git a/yarn.lock b/yarn.lock index 235fc7d7a7..2eb29a1a15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7823,19 +7823,6 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -copyfiles@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5" - integrity sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg== - dependencies: - glob "^7.0.5" - minimatch "^3.0.3" - mkdirp "^1.0.4" - noms "0.0.0" - through2 "^2.0.1" - untildify "^4.0.0" - yargs "^16.1.0" - core-js-compat@^3.30.1, core-js-compat@^3.30.2, core-js-compat@^3.8.1: version "3.31.0" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1" @@ -10628,7 +10615,7 @@ glob@^10.2.2: minipass "^5.0.0 || ^6.0.2" path-scurry "^1.10.0" -glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -12013,11 +12000,6 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== - isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -14226,7 +14208,7 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -14723,14 +14705,6 @@ nodemon@^2.0.21: touch "^3.1.0" undefsafe "^2.0.5" -noms@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859" - integrity sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow== - dependencies: - inherits "^2.0.1" - readable-stream "~1.0.31" - nopt@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" @@ -16989,16 +16963,6 @@ readable-stream@^4.1.0: events "^3.3.0" process "^0.11.10" -readable-stream@~1.0.31: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -18360,11 +18324,6 @@ string_decoder@^1.0.0, string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== - string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -18797,7 +18756,7 @@ throat@^6.0.1: resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.2.tgz#51a3fbb5e11ae72e2cf74861ed5c8020f89f29fe" integrity sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ== -through2@^2.0.0, through2@^2.0.1: +through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -19533,11 +19492,6 @@ untildify@^2.0.0: dependencies: os-homedir "^1.0.0" -untildify@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" - integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== - upath@2.0.1, upath@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" @@ -20466,7 +20420,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.1.0, yargs@^16.2.0: +yargs@16.2.0, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From de05e32845345b640296b3e61cc4e0022d80d07e Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Tue, 4 Jul 2023 17:45:23 +0100 Subject: [PATCH 21/29] Removing `bash` shell from GitHub Action --- .github/workflows/nym-wallet-publish-windows10.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 48fb9a301c..044816953b 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -56,11 +56,9 @@ jobs: encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} - name: Install app dependencies - shell: bash run: yarn --network-timeout 100000 - name: Build and sign it - shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }} From 7743554bb8607bc0289f5cfca4db45c4f6a5b084 Mon Sep 17 00:00:00 2001 From: Mark Sinclair <14054343+mmsinclair@users.noreply.github.com> Date: Wed, 5 Jul 2023 11:43:33 +0100 Subject: [PATCH 22/29] Update nym-wallet-publish-windows10.yml --- .github/workflows/nym-wallet-publish-windows10.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 044816953b..48fb9a301c 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -56,9 +56,11 @@ jobs: encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} - name: Install app dependencies + shell: bash run: yarn --network-timeout 100000 - name: Build and sign it + shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }} From 36253e3f364ea9fe31891c1b95cdc0c083adb63e Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 5 Jul 2023 12:13:21 +0100 Subject: [PATCH 23/29] GitHub Actions: fix up naming and versions --- .github/workflows/nym-connect-publish-macos.yml | 4 ++-- .github/workflows/nym-connect-publish-ubuntu.yml | 4 ++-- .github/workflows/nym-connect-publish-windows10.yml | 4 ++-- .github/workflows/nym-wallet-publish-macos.yml | 4 ++-- .github/workflows/nym-wallet-publish-ubuntu.yml | 4 ++-- .github/workflows/nym-wallet-publish-windows10.yml | 4 ++-- .github/workflows/nym_wallet.yml | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/nym-connect-publish-macos.yml b/.github/workflows/nym-connect-publish-macos.yml index 379443d4dd..eb0ff1423a 100644 --- a/.github/workflows/nym-connect-publish-macos.yml +++ b/.github/workflows/nym-connect-publish-macos.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Node v16 + - name: Node uses: actions/setup-node@v3 with: node-version: 18 @@ -51,7 +51,7 @@ jobs: security list-keychain -d user -s $KEYCHAIN_PATH - name: Create env file - uses: timheuer/base64-to-file@v1.1 + uses: timheuer/base64-to-file@v1.2 with: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} diff --git a/.github/workflows/nym-connect-publish-ubuntu.yml b/.github/workflows/nym-connect-publish-ubuntu.yml index 25d288581d..3997eb3695 100644 --- a/.github/workflows/nym-connect-publish-ubuntu.yml +++ b/.github/workflows/nym-connect-publish-ubuntu.yml @@ -26,7 +26,7 @@ jobs: sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev continue-on-error: true - - name: Node v16 + - name: Node uses: actions/setup-node@v3 with: node-version: 18 @@ -38,7 +38,7 @@ jobs: - name: Install app dependencies run: yarn - name: Create env file - uses: timheuer/base64-to-file@v1.1 + uses: timheuer/base64-to-file@v1.2 with: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} diff --git a/.github/workflows/nym-connect-publish-windows10.yml b/.github/workflows/nym-connect-publish-windows10.yml index d85b151e16..3c4f07f557 100644 --- a/.github/workflows/nym-connect-publish-windows10.yml +++ b/.github/workflows/nym-connect-publish-windows10.yml @@ -39,7 +39,7 @@ jobs: Remove-Item -path certificate -include tempCert.txt Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText) - - name: Node v16 + - name: Node uses: actions/setup-node@v3 with: node-version: 18 @@ -50,7 +50,7 @@ jobs: toolchain: stable - name: Create env file - uses: timheuer/base64-to-file@v1.1 + uses: timheuer/base64-to-file@v1.2 with: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} diff --git a/.github/workflows/nym-wallet-publish-macos.yml b/.github/workflows/nym-wallet-publish-macos.yml index 81c27a8338..16be7ef2c8 100644 --- a/.github/workflows/nym-wallet-publish-macos.yml +++ b/.github/workflows/nym-wallet-publish-macos.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Node v16 + - name: Node uses: actions/setup-node@v3 with: node-version: 18 @@ -51,7 +51,7 @@ jobs: security list-keychain -d user -s $KEYCHAIN_PATH - name: Create env file - uses: timheuer/base64-to-file@v1.1 + uses: timheuer/base64-to-file@v1.2 with: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} diff --git a/.github/workflows/nym-wallet-publish-ubuntu.yml b/.github/workflows/nym-wallet-publish-ubuntu.yml index db61b24805..4073c16f1a 100644 --- a/.github/workflows/nym-wallet-publish-ubuntu.yml +++ b/.github/workflows/nym-wallet-publish-ubuntu.yml @@ -25,7 +25,7 @@ jobs: sudo apt-get install -y webkit2gtk-4.0 continue-on-error: true - - name: Node v16 + - name: Node uses: actions/setup-node@v3 with: node-version: 18 @@ -38,7 +38,7 @@ jobs: - name: Install app dependencies run: yarn - name: Create env file - uses: timheuer/base64-to-file@v1.1 + uses: timheuer/base64-to-file@v1.2 with: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 48fb9a301c..194e6ae14c 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -39,7 +39,7 @@ jobs: Remove-Item -path certificate -include tempCert.txt Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText) - - name: Node v16 + - name: Node uses: actions/setup-node@v3 with: node-version: 18 @@ -50,7 +50,7 @@ jobs: toolchain: stable - name: Create env file - uses: timheuer/base64-to-file@v1.1 + uses: timheuer/base64-to-file@v1.2 with: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} diff --git a/.github/workflows/nym_wallet.yml b/.github/workflows/nym_wallet.yml index d110314899..8c7f6fe267 100644 --- a/.github/workflows/nym_wallet.yml +++ b/.github/workflows/nym_wallet.yml @@ -34,7 +34,7 @@ jobs: profile: minimal toolchain: stable - - name: Node v16 + - name: Node uses: actions/setup-node@v3 with: node-version: 18 From d829837275183aa9e26b9b134d929f5fb7cd8d0f Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 5 Jul 2023 12:13:39 +0100 Subject: [PATCH 24/29] GitHub Actions: install project root dependencies first --- .github/workflows/nym-wallet-publish-windows10.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/nym-wallet-publish-windows10.yml b/.github/workflows/nym-wallet-publish-windows10.yml index 194e6ae14c..92ce582d32 100644 --- a/.github/workflows/nym-wallet-publish-windows10.yml +++ b/.github/workflows/nym-wallet-publish-windows10.yml @@ -55,6 +55,10 @@ jobs: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} + - name: Install project dependencies + shell: bash + run: cd .. && yarn --network-timeout 100000 + - name: Install app dependencies shell: bash run: yarn --network-timeout 100000 From 1f4f312e8e345114f35c30cd009b58761fef1ae2 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 5 Jul 2023 12:24:06 +0100 Subject: [PATCH 25/29] Removing pre-install target --- nym-wallet/package.json | 3 +-- package.json | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nym-wallet/package.json b/nym-wallet/package.json index 36c3ca5017..f14d6dd227 100644 --- a/nym-wallet/package.json +++ b/nym-wallet/package.json @@ -18,8 +18,7 @@ "lint:fix": "eslint src --fix", "prestorybook": "yarn --cwd .. build", "storybook": "start-storybook -p 6006", - "storybook:build": "build-storybook", - "preinstall": "yarn --cwd .. setup:dependencies" + "storybook:build": "build-storybook" }, "dependencies": { "@emotion/react": "^11.7.0", diff --git a/package.json b/package.json index c796364c77..cad6eaf88d 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app", "audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run", "preinstall": "yarn install:copy-placeholders", - "setup:dependencies": "yarn install:copy-placeholders", "install:copy-placeholders": "cp scripts/build/yarn/wasm-placeholder/package.json sdk/typescript/packages/nym-client-wasm" }, "devDependencies": { From 493f0366876d8e72a44664972b0c989a2dca583b Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 5 Jul 2023 13:07:19 +0100 Subject: [PATCH 26/29] GitHub Actions: fix up installing project dependencies --- .github/workflows/nym-connect-publish-macos.yml | 4 ++++ .github/workflows/nym-connect-publish-ubuntu.yml | 6 ++++++ .github/workflows/nym-connect-publish-windows10.yml | 4 ++++ .github/workflows/nym-wallet-publish-macos.yml | 4 ++++ .github/workflows/nym-wallet-publish-ubuntu.yml | 4 ++++ 5 files changed, 22 insertions(+) diff --git a/.github/workflows/nym-connect-publish-macos.yml b/.github/workflows/nym-connect-publish-macos.yml index eb0ff1423a..59b8085f6e 100644 --- a/.github/workflows/nym-connect-publish-macos.yml +++ b/.github/workflows/nym-connect-publish-macos.yml @@ -56,6 +56,10 @@ jobs: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} + - name: Install project dependencies + shell: bash + run: cd .. && yarn --network-timeout 100000 + - name: Install app dependencies and build it env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/nym-connect-publish-ubuntu.yml b/.github/workflows/nym-connect-publish-ubuntu.yml index 3997eb3695..87dd024d0c 100644 --- a/.github/workflows/nym-connect-publish-ubuntu.yml +++ b/.github/workflows/nym-connect-publish-ubuntu.yml @@ -35,8 +35,14 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable + + - name: Install project dependencies + shell: bash + run: cd .. && yarn --network-timeout 100000 + - name: Install app dependencies run: yarn + - name: Create env file uses: timheuer/base64-to-file@v1.2 with: diff --git a/.github/workflows/nym-connect-publish-windows10.yml b/.github/workflows/nym-connect-publish-windows10.yml index 3c4f07f557..a8f723d319 100644 --- a/.github/workflows/nym-connect-publish-windows10.yml +++ b/.github/workflows/nym-connect-publish-windows10.yml @@ -55,6 +55,10 @@ jobs: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} + - name: Install project dependencies + shell: bash + run: cd .. && yarn --network-timeout 100000 + - name: Install app dependencies shell: bash run: yarn --network-timeout 100000 diff --git a/.github/workflows/nym-wallet-publish-macos.yml b/.github/workflows/nym-wallet-publish-macos.yml index 16be7ef2c8..1023af55ba 100644 --- a/.github/workflows/nym-wallet-publish-macos.yml +++ b/.github/workflows/nym-wallet-publish-macos.yml @@ -56,6 +56,10 @@ jobs: fileName: '.env' encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }} + - name: Install project dependencies + shell: bash + run: cd .. && yarn --network-timeout 100000 + - name: Install app dependencies and build it env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/nym-wallet-publish-ubuntu.yml b/.github/workflows/nym-wallet-publish-ubuntu.yml index 4073c16f1a..d11e5d10dd 100644 --- a/.github/workflows/nym-wallet-publish-ubuntu.yml +++ b/.github/workflows/nym-wallet-publish-ubuntu.yml @@ -35,6 +35,10 @@ jobs: with: toolchain: stable + - name: Install project dependencies + shell: bash + run: cd .. && yarn --network-timeout 100000 + - name: Install app dependencies run: yarn - name: Create env file From 68d6ece6c27e75fce44d80ae8ed31f446802b412 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 5 Jul 2023 13:11:03 +0100 Subject: [PATCH 27/29] GitHub Actions: add manual trigger --- .github/workflows/nym-wallet-publish-ubuntu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nym-wallet-publish-ubuntu.yml b/.github/workflows/nym-wallet-publish-ubuntu.yml index d11e5d10dd..3194032973 100644 --- a/.github/workflows/nym-wallet-publish-ubuntu.yml +++ b/.github/workflows/nym-wallet-publish-ubuntu.yml @@ -1,5 +1,6 @@ name: Publish Nym Wallet (Ubuntu) on: + workflow_dispatch: release: types: [created] From 0e48ff5e9ed6be65d4e9ac44c2ca791a67157a9f Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 5 Jul 2023 13:49:12 +0100 Subject: [PATCH 28/29] GitHub Action: upload artifact --- .github/workflows/nym-wallet-publish-ubuntu.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/nym-wallet-publish-ubuntu.yml b/.github/workflows/nym-wallet-publish-ubuntu.yml index 3194032973..bb653d7593 100644 --- a/.github/workflows/nym-wallet-publish-ubuntu.yml +++ b/.github/workflows/nym-wallet-publish-ubuntu.yml @@ -53,8 +53,17 @@ jobs: env: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} + + - name: Upload Artifact + uses: actions/upload-artifact@v3 + with: + name: nym-wallet_1.0.0_amd64.AppImage.tar.gz + path: nym-wallet/target/release/bundle/appimage/nym-wallet*.AppImage.tar.gz + retention-days: 30 + - name: Upload to release based on tag name uses: softprops/action-gh-release@v1 + if: github.event_name == 'release' with: files: | nym-wallet/target/release/bundle/appimage/*.AppImage From bdda08c0b436218a848fe8eefe705db5b82cf7f5 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 5 Jul 2023 14:28:10 +0100 Subject: [PATCH 29/29] GitHub Actions: Change artifact upload paths to wildcards --- .github/workflows/nym-connect-publish-macos.yml | 2 +- .github/workflows/nym-connect-publish-ubuntu.yml | 2 +- .github/workflows/nym-connect-publish-windows10.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nym-connect-publish-macos.yml b/.github/workflows/nym-connect-publish-macos.yml index 59b8085f6e..fd52c251e2 100644 --- a/.github/workflows/nym-connect-publish-macos.yml +++ b/.github/workflows/nym-connect-publish-macos.yml @@ -77,7 +77,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: nym-connect_1.0.0_x64.dmg - path: nym-connect/desktop/target/release/bundle/dmg/nym-connect_1.0.0_x64.dmg + path: nym-connect/desktop/target/release/bundle/dmg/nym-connect_1*_x64.dmg retention-days: 30 - name: Clean up keychain diff --git a/.github/workflows/nym-connect-publish-ubuntu.yml b/.github/workflows/nym-connect-publish-ubuntu.yml index 87dd024d0c..dbeef8a378 100644 --- a/.github/workflows/nym-connect-publish-ubuntu.yml +++ b/.github/workflows/nym-connect-publish-ubuntu.yml @@ -59,7 +59,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: nym-connect.AppImage.tar.gz - path: nym-connect/desktop/target/release/bundle/appimage/nym-connect_1.0.0_amd64.AppImage + path: nym-connect/desktop/target/release/bundle/appimage/nym-connect_1*_amd64.AppImage retention-days: 30 - name: Upload to release based on tag name diff --git a/.github/workflows/nym-connect-publish-windows10.yml b/.github/workflows/nym-connect-publish-windows10.yml index a8f723d319..0a7911c6ed 100644 --- a/.github/workflows/nym-connect-publish-windows10.yml +++ b/.github/workflows/nym-connect-publish-windows10.yml @@ -78,7 +78,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: nym-connect_1.0.0_x64_en-US.msi - path: nym-connect/desktop/target/release/bundle/msi/nym-connect_1.0.0_x64_en-US.msi + path: nym-connect/desktop/target/release/bundle/msi/nym-connect_1*_x64_en-US.msi retention-days: 30 - name: Upload to release based on tag name