From 85758be9ca805244b4fa4bb8677e7372b28f1152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Mon, 9 Sep 2024 12:00:28 +0200 Subject: [PATCH] Start switching over jobs to arc-ubuntu-20.04 (#4843) * Switch ci-build to arc-ubuntu-20.04 * Trigger on wf file chanes * Add IPR and authenticator to default workspace * Move over a few more * and more * Revert two builds that require docker * typo in label * Revert two more * Fix go * update * update --- .github/workflows/ci-binary-config-checker.yml | 4 +++- .github/workflows/ci-build-ts.yml | 1 + .github/workflows/ci-build-upload-binaries.yml | 3 ++- .github/workflows/ci-build.yml | 4 +++- .github/workflows/ci-cargo-deny.yml | 6 +++++- .github/workflows/ci-contracts-schema.yml | 3 ++- .github/workflows/ci-contracts-upload-binaries.yml | 3 ++- .github/workflows/ci-contracts.yml | 3 ++- .github/workflows/ci-docs.yml | 3 ++- .github/workflows/ci-lint-typescript.yml | 1 + .github/workflows/ci-nym-network-explorer.yml | 1 + .github/workflows/ci-nym-wallet-rust.yml | 4 +++- .github/workflows/ci-nym-wallet-storybook.yml | 1 + .github/workflows/ci-sdk-docs-typescript.yml | 1 + .github/workflows/ci-sdk-wasm.yml | 13 ++++++++++++- Cargo.toml | 12 ++++++------ 16 files changed, 47 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-binary-config-checker.yml b/.github/workflows/ci-binary-config-checker.yml index fc151c73dd..7f4717f883 100644 --- a/.github/workflows/ci-binary-config-checker.yml +++ b/.github/workflows/ci-binary-config-checker.yml @@ -13,6 +13,7 @@ on: - 'mixnode/**' - 'sdk/rust/nym-sdk/**' - 'service-providers/**' + - '.github/workflows/ci-binary-config-checker.yml' pull_request: paths: - 'clients/**' @@ -22,6 +23,7 @@ on: - 'mixnode/**' - 'sdk/rust/nym-sdk/**' - 'service-providers/**' + - '.github/workflows/ci-binary-config-checker.yml' env: NETWORK: mainnet @@ -31,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [custom-linux] + platform: [arc-ubuntu-20.04] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/ci-build-ts.yml b/.github/workflows/ci-build-ts.yml index 624a52245d..4c8dbe6b7c 100644 --- a/.github/workflows/ci-build-ts.yml +++ b/.github/workflows/ci-build-ts.yml @@ -5,6 +5,7 @@ on: paths: - "ts-packages/**" - "sdk/typescript/**" + - ".github/workflows/ci-build-ts.yml" jobs: build: diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml index c30f9c3528..778cf58050 100644 --- a/.github/workflows/ci-build-upload-binaries.yml +++ b/.github/workflows/ci-build-upload-binaries.yml @@ -31,13 +31,14 @@ on: - "service-providers/**" - "tools/**" - "nymvisor/**" + - ".github/workflows/ci-build-upload-binaries.yml" jobs: publish-nym: strategy: fail-fast: false matrix: - platform: [ ubuntu-20.04 ] + platform: [ arc-ubuntu-20.04 ] runs-on: ${{ matrix.platform }} env: diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 2c950f902a..4293eba2ab 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -18,6 +18,7 @@ on: - 'tools/nym-nr-query/**' - 'tools/ts-rs-cli/**' - 'Cargo.toml' + - '.github/workflows/ci-build.yml' pull_request: paths: - 'clients/**' @@ -35,6 +36,7 @@ on: - 'tools/nym-nr-query/**' - 'tools/ts-rs-cli/**' - 'Cargo.toml' + - '.github/workflows/ci-build.yml' workflow_dispatch: jobs: @@ -42,7 +44,7 @@ jobs: strategy: fail-fast: false matrix: - os: [custom-linux, custom-runner-mac-m1] + os: [arc-ubuntu-20.04, custom-runner-mac-m1] runs-on: ${{ matrix.os }} env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/ci-cargo-deny.yml b/.github/workflows/ci-cargo-deny.yml index e695c17e51..fc844695c1 100644 --- a/.github/workflows/ci-cargo-deny.yml +++ b/.github/workflows/ci-cargo-deny.yml @@ -2,10 +2,14 @@ name: ci-cargo-deny on: workflow_dispatch: pull_request: + paths: + - 'Cargo.toml' + - 'Cargo.lock' + - '.github/workflows/ci-cargo-deny.yml' jobs: cargo-deny: - runs-on: ubuntu-22.04 + runs-on: arc-ubuntu-22.04-dind strategy: matrix: checks: diff --git a/.github/workflows/ci-contracts-schema.yml b/.github/workflows/ci-contracts-schema.yml index 5f5ea4e538..054d68f9bc 100644 --- a/.github/workflows/ci-contracts-schema.yml +++ b/.github/workflows/ci-contracts-schema.yml @@ -6,11 +6,12 @@ on: paths: - 'contracts/**' - 'common/**' + - '.github/workflows/ci-contracts-schema.yml' jobs: check-schema: name: Generate and check schema - runs-on: custom-linux + runs-on: arc-ubuntu-20.04 env: CARGO_TERM_COLOR: always steps: diff --git a/.github/workflows/ci-contracts-upload-binaries.yml b/.github/workflows/ci-contracts-upload-binaries.yml index 77899f495a..4873d46885 100644 --- a/.github/workflows/ci-contracts-upload-binaries.yml +++ b/.github/workflows/ci-contracts-upload-binaries.yml @@ -6,6 +6,7 @@ on: paths: - 'common/**' - 'contracts/**' + - '.github/workflows/ci-contracts-upload-binaries.yml' env: NETWORK: mainnet @@ -15,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ ubuntu-20.04 ] + platform: arc-ubuntu-20.04 runs-on: ${{ matrix.platform }} env: diff --git a/.github/workflows/ci-contracts.yml b/.github/workflows/ci-contracts.yml index cb88ca85f3..150ec5d6e9 100644 --- a/.github/workflows/ci-contracts.yml +++ b/.github/workflows/ci-contracts.yml @@ -9,10 +9,11 @@ on: paths: - 'contracts/**' - 'common/**' + - '.github/workflows/ci-contracts.yml' jobs: matrix_prep: - runs-on: ubuntu-20.04 + runs-on: arc-ubuntu-20.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 12fb22be4e..877248d76e 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -6,10 +6,11 @@ on: branches-ignore: master paths: - 'documentation/docs/**' + - '.github/workflows/ci-docs.yml' jobs: build: - runs-on: ubuntu-20.04-16-core + runs-on: arc-ubuntu-20.04 steps: - uses: actions/checkout@v4 - name: Install Dependencies (Linux) diff --git a/.github/workflows/ci-lint-typescript.yml b/.github/workflows/ci-lint-typescript.yml index f14b713c45..165446bbd8 100644 --- a/.github/workflows/ci-lint-typescript.yml +++ b/.github/workflows/ci-lint-typescript.yml @@ -10,6 +10,7 @@ on: - "nym-wallet/src/**" - "nym-wallet/package.json" - "explorer/**" + - ".github/workflows/ci-lint-typescript.yml" jobs: build: diff --git a/.github/workflows/ci-nym-network-explorer.yml b/.github/workflows/ci-nym-network-explorer.yml index 82516e6ddb..b1cb2d9de3 100644 --- a/.github/workflows/ci-nym-network-explorer.yml +++ b/.github/workflows/ci-nym-network-explorer.yml @@ -5,6 +5,7 @@ on: push: paths: - 'explorer/**' + - '.github/workflows/ci-nym-network-explorer.yml' defaults: run: diff --git a/.github/workflows/ci-nym-wallet-rust.yml b/.github/workflows/ci-nym-wallet-rust.yml index d9001ff24d..62115b2738 100644 --- a/.github/workflows/ci-nym-wallet-rust.yml +++ b/.github/workflows/ci-nym-wallet-rust.yml @@ -7,16 +7,18 @@ on: - 'common/**' - 'contracts/vesting/**' - 'nym-api/nym-api-requests/**' + - '.github/workflows/ci-nym-wallet-rust.yml' pull_request: paths: - 'nym-wallet/**' - 'common/**' - 'contracts/vesting/**' - 'nym-api/nym-api-requests/**' + - '.github/workflows/ci-nym-wallet-rust.yml' jobs: build: - runs-on: [ self-hosted, custom-linux ] + runs-on: arc-ubuntu-20.04 env: CARGO_TERM_COLOR: always steps: diff --git a/.github/workflows/ci-nym-wallet-storybook.yml b/.github/workflows/ci-nym-wallet-storybook.yml index 91fbfcd4e5..a6b1fde221 100644 --- a/.github/workflows/ci-nym-wallet-storybook.yml +++ b/.github/workflows/ci-nym-wallet-storybook.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'nym-wallet/**' + - '.github/workflows/ci-nym-wallet-storybook.yml' jobs: build: diff --git a/.github/workflows/ci-sdk-docs-typescript.yml b/.github/workflows/ci-sdk-docs-typescript.yml index dac1612f8b..836150ad23 100644 --- a/.github/workflows/ci-sdk-docs-typescript.yml +++ b/.github/workflows/ci-sdk-docs-typescript.yml @@ -5,6 +5,7 @@ on: paths: - "sdk/typescript/**" - "wasm/**" + - '.github/workflows/ci-sdk-docs-typescript.yml' jobs: build: diff --git a/.github/workflows/ci-sdk-wasm.yml b/.github/workflows/ci-sdk-wasm.yml index 39fd471b06..10fc1c70ff 100644 --- a/.github/workflows/ci-sdk-wasm.yml +++ b/.github/workflows/ci-sdk-wasm.yml @@ -6,10 +6,11 @@ on: - 'wasm/**' - 'clients/client-core/**' - 'common/**' + - '.github/workflows/ci-sdk-wasm.yml' jobs: wasm: - runs-on: [custom-linux] + runs-on: arc-ubuntu-20.04 env: CARGO_TERM_COLOR: always steps: @@ -32,6 +33,16 @@ jobs: with: go-version: '1.20' + - name: Override GOROOT and GOTOOLDIR + run: | + echo "Setting correct GOROOT and GOTOOLDIR" + unset GOROOT + unset GOTOOLDIR + export GOROOT=$(go env GOROOT) + export GOTOOLDIR=$(go env GOTOOLDIR) + echo "GOROOT=$GOROOT" >> $GITHUB_ENV + echo "GOTOOLDIR=$GOTOOLDIR" >> $GITHUB_ENV + - name: Install wasm-pack run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh diff --git a/Cargo.toml b/Cargo.toml index 2be451eb47..fa57151495 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -133,14 +133,16 @@ members = [ default-members = [ "clients/native", "clients/socks5", + "explorer-api", "gateway", - "service-providers/network-requester", "mixnode", "nym-api", - "tools/nymvisor", - "explorer-api", - "nym-validator-rewarder", "nym-node", + "nym-validator-rewarder", + "service-providers/authenticator", + "service-providers/ip-packet-router", + "service-providers/network-requester", + "tools/nymvisor", ] exclude = [ @@ -260,9 +262,7 @@ pretty_env_logger = "0.4.0" publicsuffix = "2.2.3" quote = "1" rand = "0.8.5" -rand-07 = "0.7.3" rand_chacha = "0.3" -rand_chacha_02 = "0.2" rand_core = "0.6.3" rand_distr = "0.4" rand_pcg = "0.3.1"