Skip to content

Commit

Permalink
Merge updates and update mixFetcha and mixnet examples
Browse files Browse the repository at this point in the history
  • Loading branch information
Lorex-ia committed Nov 7, 2023
2 parents 4c2c738 + 268588d commit dea3f7d
Show file tree
Hide file tree
Showing 581 changed files with 30,583 additions and 4,510 deletions.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Build and upload binaries to artifact storage
name: build-upload-binaries

on:
workflow_dispatch:
inputs:
inputs:
add_tokio_unstable:
description: 'True to add RUSTFLAGS="--cfg tokio_unstable"'
required: true
default: false
type: boolean
type: boolean

env:
NETWORK: mainnet
NETWORK: mainnet

jobs:
publish-nym:
Expand Down
30 changes: 3 additions & 27 deletions .github/workflows/cd-docs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CD docs
name: cd-docs

on:
workflow_dispatch:
Expand All @@ -9,7 +9,7 @@ on:

jobs:
build:
runs-on: custom-runner-linux
runs-on: custom-linux
steps:
- uses: actions/checkout@v3
- name: Install rsync
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Run config checks on all binaries
name: ci-binary-config-checker

on:
workflow_dispatch:
Expand Down Expand Up @@ -31,8 +31,8 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [custom-runner-linux]
platform: [custom-linux]

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
Expand All @@ -45,12 +45,12 @@ jobs:
uses: actions-rs/toolchain@v1
with:
toolchain: stable

- name: Branch name
run: echo running on branch ${GITHUB_REF##*/}

- name: Run tests against binaries
run: ./build_and_run.sh ${{ github.head_ref || github.ref_name }}
working-directory: tests/


2 changes: 1 addition & 1 deletion .github/workflows/ci-build-ts.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ci-build-ts

on:
push:
pull_request:
paths:
- "ts-packages/**"
- "sdk/typescript/**"
Expand Down
22 changes: 1 addition & 21 deletions .github/workflows/ci-build-upload-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,6 @@ name: ci-build-upload-binaries

on:
workflow_dispatch:
push:
paths:
- 'clients/**'
- 'common/**'
- 'explorer-api/**'
- 'gateway/**'
- 'integrations/**'
- 'mixnode/**'
- 'sdk/rust/nym-sdk/**'
- 'service-providers/**'
- 'nym-api/**'
- 'nym-outfox/**'
- 'tools/nym-cli/**'
- 'tools/ts-rs-cli/**'
pull_request:
paths:
- 'clients/**'
Expand All @@ -31,9 +17,6 @@ on:
- 'tools/nym-cli/**'
- 'tools/ts-rs-cli/**'

env:
NETWORK: mainnet

jobs:
publish-nym:
strategy:
Expand All @@ -44,8 +27,6 @@ jobs:
runs-on: ${{ matrix.platform }}
env:
CARGO_TERM_COLOR: always
# a push event from the origin repo, or a PR from external repo
if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }}
steps:
- uses: actions/checkout@v3

Expand All @@ -59,8 +40,7 @@ jobs:
echo $OUTPUT_DIR
- name: Install Dependencies (Linux)
run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
continue-on-error: true
run: sudo apt update && sudo apt install libudev-dev

- name: Install Rust stable
uses: actions-rs/toolchain@v1
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ jobs:
runs-on: ${{ matrix.os }}
env:
CARGO_TERM_COLOR: always
# Enable sccache via environment variable
# env:
# RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
steps:
- name: Install Dependencies (Linux)
run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/ci-contracts-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ name: ci-contracts-schema

on:
workflow_dispatch:
push:
paths:
- 'contracts/**'
- 'common/**'
pull_request:
paths:
- 'contracts/**'
Expand All @@ -14,7 +10,7 @@ on:
jobs:
check-schema:
name: Generate and check schema
runs-on: custom-runner-linux
runs-on: custom-linux
env:
CARGO_TERM_COLOR: always
steps:
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/ci-contracts-upload-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ name: ci-contracts-upload-binaries

on:
workflow_dispatch:
push:
paths:
- 'common/**'
- 'contracts/**'
pull_request:
paths:
- 'common/**'
Expand All @@ -24,8 +20,6 @@ jobs:
runs-on: ${{ matrix.platform }}
env:
CARGO_TERM_COLOR: always
# a push event from the origin repo, or a PR from external repo
if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }}
steps:
- uses: actions/checkout@v3

Expand All @@ -38,19 +32,17 @@ jobs:
mkdir -p $OUTPUT_DIR
echo $OUTPUT_DIR
- name: Install Dependencies (Linux)
run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
continue-on-error: true

- 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
run: cargo install --version 0.112.0 wasm-opt
uses: ./.github/actions/install-wasm-opt
with:
version: '114'

- name: Build release contracts
run: make contracts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
build:
runs-on: custom-runner-linux
runs-on: custom-linux
steps:
- uses: actions/checkout@v3
- name: Install rsync
Expand All @@ -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
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/ci-lint-typescript.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
name: ci-lint-typescript

on:
push:
paths:
- "ts-packages/**"
- "sdk/typescript/**"
- "nym-connect/desktop/src/**"
- "nym-connect/desktop/package.json"
- "nym-wallet/src/**"
- "nym-wallet/package.json"
- "explorer/**"
pull_request:
paths:
- "ts-packages/**"
Expand Down Expand Up @@ -37,10 +28,14 @@ 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 wasm-opt
run: cargo install wasm-opt
uses: ./.github/actions/install-wasm-opt
with:
version: '116'

- name: Set up Go
uses: actions/setup-go@v4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI for Nym API Tests
name: ci-nym-api-tests

on:
workflow_dispatch:
Expand All @@ -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:
Expand Down
24 changes: 6 additions & 18 deletions .github/workflows/ci-nym-connect-desktop-rust.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
name: ci-nym-connect-desktop-rust

on:
push:
paths:
- "nym-connect/desktop/src-tauri/**"
- "nym-connect/desktop/src-tauri/Cargo.toml"
- "clients/client-core/**"
- "clients/socks5/**"
- "common/**"
- "gateway/gateway-requests/**"
- "contracts/vesting/**"
- "nym-api/nym-api-requests/**"
pull_request:
paths:
- "nym-connect/desktop/src-tauri/**"
Expand All @@ -27,8 +17,6 @@ jobs:
runs-on: [self-hosted, custom-linux]
env:
CARGO_TERM_COLOR: always
# env:
# RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
steps:
- name: Install Dependencies (Linux)
run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libayatana-appindicator3-dev
Expand All @@ -45,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:
Expand All @@ -57,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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-nym-connect-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ci-nym-connect-desktop

on:
push:
pull_request:
paths:
- 'nym-connect/desktop/**'

Expand All @@ -11,7 +11,7 @@ defaults:

jobs:
build:
runs-on: custom-runner-linux
runs-on: custom-linux
steps:
- uses: actions/checkout@v2
- name: Install rsync
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-nym-network-explorer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ defaults:

jobs:
build:
runs-on: custom-runner-linux
runs-on: custom-linux
steps:
- uses: actions/checkout@v2
- name: Install rsync
Expand Down
Loading

0 comments on commit dea3f7d

Please sign in to comment.