Merging Release/2023.4-galaxy (#4111)

.github/workflows/cd-docs.yml

@@ -1,4 +1,4 @@
-name: CD docs
+name: cd-docs
 
 on:
  workflow_dispatch:
@@ -26,7 +26,7 @@ jobs:
  uses: actions-rs/cargo@v1
  with:
  command: build
- args: --workspace --release --all
+ args: --workspace --release
  - name: Install mdbook
  run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.33" mdbook)
  - name: Install mdbook plugins
@@ -39,30 +39,6 @@ jobs:
  run: cd documentation && ./build_all_to_dist.sh
  continue-on-error: false
 
- - name: Deploy branch master to dev
- continue-on-error: true
- uses: easingthemes/ssh-deploy@main
- env:
- SSH_PRIVATE_KEY: ${{ secrets.CD_WWW_SSH_PRIVATE_KEY }}
- ARGS: "-rltgoDzvO --delete"
- SOURCE: "dist/docs/"
- REMOTE_HOST: ${{ secrets.CD_WWW_REMOTE_HOST_DEV }}
- REMOTE_USER: ${{ secrets.CD_WWW_REMOTE_USER }}
- TARGET: ${{ secrets.CD_WWW_REMOTE_TARGET }}/
- EXCLUDE: "/node_modules/"
-
- - name: Deploy branch master to prod
- if: github.ref == 'refs/heads/master'
- uses: easingthemes/ssh-deploy@main
- env:
- SSH_PRIVATE_KEY: ${{ secrets.CD_WWW_SSH_PRIVATE_KEY }}
- ARGS: "-rltgoDzvO --delete"
- SOURCE: "dist/docs/"
- REMOTE_HOST: ${{ secrets.CD_WWW_REMOTE_HOST_PROD }}
- REMOTE_USER: ${{ secrets.CD_WWW_REMOTE_USER }}
- TARGET: ${{ secrets.CD_WWW_REMOTE_TARGET }}/
- EXCLUDE: "/node_modules/"
-
  - name: Post process
  run: cd documentation && ./post_process.sh
  continue-on-error: false

.github/workflows/ci-binary-checker.yml → .github/workflows/ci-binary-config-checker.yml

@@ -1,4 +1,4 @@
-name: Run config checks on all binaries
+name: ci-binary-config-checker
 
 on:
  workflow_dispatch:

.github/workflows/ci-contracts-upload-binaries.yml

@@ -35,14 +35,14 @@ jobs:
  - name: Install Rust stable
  uses: actions-rs/toolchain@v1
  with:
- toolchain: 1.69.0
+ toolchain: stable
  target: wasm32-unknown-unknown
  override: true
 
  - name: Install wasm-opt
  uses: ./.github/actions/install-wasm-opt
  with:
- version: '112'
+ version: '114'
 
  - name: Build release contracts
  run: make contracts

.github/workflows/ci-docs.yml

@@ -26,7 +26,7 @@ jobs:
  uses: actions-rs/cargo@v1
  with:
  command: build
- args: --workspace --release --all
+ args: --workspace --release
  - name: Install mdbook
  run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.35" mdbook)
  - name: Install mdbook plugins

.github/workflows/ci-nym-api-tests.yml

@@ -1,4 +1,4 @@
-name: CI for Nym API Tests
+name: ci-nym-api-tests
 
 on:
  workflow_dispatch:
@@ -16,10 +16,10 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v2
- 
+
  - name: Install npm
  run: npm install
- 
+
  - name: Node v18
  uses: actions/setup-node@v3
  with:

.github/workflows/ci-nym-connect-desktop-rust.yml

@@ -33,6 +33,12 @@ jobs:
  override: true
  components: rustfmt, clippy
 
+ - name: Check formatting
+ uses: actions-rs/cargo@v1
+ with:
+ command: fmt
+ args: --manifest-path nym-connect/desktop/Cargo.toml --all -- --check
+
  - name: Build all binaries
  uses: actions-rs/cargo@v1
  with:
@@ -45,12 +51,6 @@ jobs:
  command: test
  args: --manifest-path nym-connect/desktop/Cargo.toml --workspace
 
- - name: Check formatting
- uses: actions-rs/cargo@v1
- with:
- command: fmt
- args: --manifest-path nym-connect/desktop/Cargo.toml --all -- --check
-
  - uses: actions-rs/clippy-check@v1
  name: Clippy checks
  continue-on-error: true

.github/workflows/ci-nym-vpn-ui-js.yml

@@ -1,11 +1,7 @@
 name: ci-nym-vpn-ui-js
 
 on:
- push:
- paths:
- - 'nym-vpn/ui/src/**'
- - 'nym-vpn/ui/package.json'
- - 'nym-vpn/ui/index.html'
+ workflow_dispatch:
  pull_request:
  paths:
  - 'nym-vpn/ui/src/**'
@@ -14,7 +10,7 @@ on:
 
 jobs:
  check:
- runs-on: [ self-hosted, custom-linux ]
+ runs-on: custom-linux
  steps:
  - name: Checkout
  uses: actions/checkout@v4

.github/workflows/ci-nym-vpn-ui-rust.yml

@@ -1,16 +1,14 @@
 name: ci-nym-vpn-ui-rust
 
 on:
- push:
- paths:
- - 'nym-vpn/ui/src-tauri/**'
+ workflow_dispatch:
  pull_request:
  paths:
  - 'nym-vpn/ui/src-tauri/**'
 
 jobs:
  build:
- runs-on: [self-hosted, custom-linux]
+ runs-on: custom-linux
  env:
  CARGO_TERM_COLOR: always
  CARGOTOML_PATH: ./nym-vpn/ui/src-tauri/Cargo.toml
@@ -31,34 +29,35 @@ jobs:
  components: rustfmt, clippy
 
  - name: Prepare build
- working-directory: nym-vpn/ui/
- run: mkdir dist
+ run: mkdir nym-vpn/ui/dist
 
- - name: Check build
- working-directory: nym-vpn/ui/src-tauri
- run: cargo build --release --lib --features custom-protocol
+ - name: Build
+ uses: actions-rs/cargo@v1
+ with:
+ command: build
+ args: --manifest-path ${{ env.CARGOTOML_PATH }} --lib --features custom-protocol
 
 # - name: Run all tests
 # uses: actions-rs/cargo@v1
 # with:
 # command: test
-# args: --manifest-path ${{ env.CARGOTOML_PATH }} --workspace
+# args: --manifest-path ${{ env.CARGOTOML_PATH }}
 
  - name: Check formatting
  uses: actions-rs/cargo@v1
  with:
  command: fmt
  args: --manifest-path ${{ env.CARGOTOML_PATH }} --all -- --check
 
- - uses: actions-rs/clippy-check@v1
- name: Clippy checks
+ - name: Annotate with clippy checks
+ uses: actions-rs/clippy-check@v1
  continue-on-error: true
  with:
  token: ${{ secrets.GITHUB_TOKEN }}
- args: --manifest-path ${{ env.CARGOTOML_PATH }} --workspace --all-features
+ args: --manifest-path ${{ env.CARGOTOML_PATH }} --all-features
 
- - name: Run clippy
+ - name: Clippy
  uses: actions-rs/cargo@v1
  with:
  command: clippy
- args: --manifest-path ${{ env.CARGOTOML_PATH }} --workspace --all-features -- -D warnings
+ args: --manifest-path ${{ env.CARGOTOML_PATH }} --all-features --all-targets -- -D warnings

.github/workflows/nightly-build.yml

@@ -4,26 +4,26 @@ on:
  workflow_dispatch:
  schedule:
  - cron: '14 1 * * *'
+
 jobs:
  build:
  strategy:
  fail-fast: false
  matrix:
  rust: [stable, beta]
- os: [custom-linux, windows10, custom-runner-mac-m1]
+ os: [ubuntu-20.04, windows-latest, macos-latest]
  runs-on: ${{ matrix.os }}
  env:
  CARGO_TERM_COLOR: always
  continue-on-error: true
  steps:
- - name: Install Dependencies (Linux)
- run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler
- continue-on-error: true
- if: matrix.os == 'custom-linux'
-
  - name: Check out repository code
  uses: actions/checkout@v3
 
+ - name: Install Dependencies (Linux)
+ run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler
+ if: matrix.os == 'ubuntu-20.04'
+
  - name: Install Rust toolchain
  uses: actions-rs/toolchain@v1
  with:
@@ -32,6 +32,12 @@ jobs:
  override: true
  components: rustfmt, clippy
 
+ - name: Install Protoc
+ uses: arduino/setup-protoc@v2
+ if: matrix.os == 'macos-latest' || matrix.os == 'windows-latest'
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+
  - name: Check formatting
  uses: actions-rs/cargo@v1
  with:
@@ -42,13 +48,27 @@ jobs:
  uses: actions-rs/cargo@v1
  with:
  command: build
- args: --workspace
+ args: --release --workspace
 
  - name: Build examples
  uses: actions-rs/cargo@v1
  with:
  command: build
- args: --workspace --examples
+ args: --release --workspace --examples
+
+ # To avoid running out of disk space, skip generating debug symbols
+ - name: Set debug to false (unix)
+ if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-latest'
+ run: |
+ sed -i.bak 's/\[profile.dev\]/\[profile.dev\]\ndebug = false/' Cargo.toml
+ git diff
+
+ - name: Set debug to false (win)
+ if: matrix.os == 'windows-latest'
+ shell: pwsh
+ run: |
+ (Get-Content Cargo.toml) -replace '\[profile.dev\]', "`$&`ndebug = false" | Set-Content Cargo.toml
+ git diff
 
  - name: Run unit tests
  uses: actions-rs/cargo@v1
@@ -62,6 +82,11 @@ jobs:
  command: test
  args: --workspace -- --ignored
 
+ - name: Clean
+ uses: actions-rs/cargo@v1
+ with:
+ command: clean
+
  - name: Clippy
  uses: actions-rs/cargo@v1
  with:

.github/workflows/nightly-nym-connect-desktop-build.yml

@@ -0,0 +1,92 @@
+name: nightly-nym-connect-desktop-build
+
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: '14 1 * * *'
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ubuntu-20.04, macos-latest, windows-latest]
+ runs-on: ${{ matrix.os }}
+ env:
+ CARGO_TERM_COLOR: always
+ MANIFEST_PATH: --manifest-path nym-connect/desktop/Cargo.toml
+ continue-on-error: true
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v3
+
+ - name: Install Dependencies (Linux)
+ run: sudo apt-get update && sudo apt-get install -y libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
+ if: matrix.os == 'ubuntu-20.04'
+
+ - name: Install rust toolchain
+ uses: actions-rs/toolchain@v1
+ with:
+ profile: minimal
+ toolchain: stable
+ override: true
+ components: rustfmt, clippy
+
+ - name: Check formatting
+ uses: actions-rs/cargo@v1
+ with:
+ command: fmt
+ args: ${{ env.MANIFEST_PATH }} --all -- --check
+
+ - name: Build
+ uses: actions-rs/cargo@v1
+ with:
+ command: build
+ args: ${{ env.MANIFEST_PATH }} --release --workspace
+
+ - name: Unit tests
+ uses: actions-rs/cargo@v1
+ with:
+ command: test
+ args: ${{ env.MANIFEST_PATH }} --workspace
+
+ - name: Clippy
+ uses: actions-rs/cargo@v1
+ with:
+ command: clippy
+ args: ${{ env.MANIFEST_PATH }} --workspace --all-targets -- -D warnings
+
+ notification:
+ needs: build
+ runs-on: custom-linux
+ steps:
+ - name: Collect jobs status
+ uses: technote-space/workflow-conclusion-action@v2
+ - name: Check out repository code
+ uses: actions/checkout@v3
+ - name: install npm
+ uses: actions/setup-node@v3
+ if: env.WORKFLOW_CONCLUSION == 'failure'
+ with:
+ node-version: 18
+ - name: Matrix - Node Install
+ if: env.WORKFLOW_CONCLUSION == 'failure'
+ run: npm install
+ working-directory: .github/workflows/support-files
+ - name: Matrix - Send Notification
+ if: env.WORKFLOW_CONCLUSION == 'failure'
+ env:
+ NYM_NOTIFICATION_KIND: nightly
+ NYM_PROJECT_NAME: "nym-connect-desktop-nightly-build"
+ GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+ GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+ GIT_BRANCH: "${GITHUB_REF##*/}"
+ IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
+ MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+ MATRIX_ROOM: "${{ secrets.MATRIX_ROOM_NIGHTLY }}"
+ MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
+ MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
+ MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+ uses: docker://keybaseio/client:stable-node
+ with:
+ args: .github/workflows/support-files/notifications/entry_point.sh