Skip to content

Commit

Permalink
Start switching over jobs to arc-ubuntu-20.04 (#4843)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
octol authored Sep 9, 2024
1 parent dd70192 commit 85758be
Show file tree
Hide file tree
Showing 16 changed files with 47 additions and 16 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci-binary-config-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- 'mixnode/**'
- 'sdk/rust/nym-sdk/**'
- 'service-providers/**'
- '.github/workflows/ci-binary-config-checker.yml'
pull_request:
paths:
- 'clients/**'
Expand All @@ -22,6 +23,7 @@ on:
- 'mixnode/**'
- 'sdk/rust/nym-sdk/**'
- 'service-providers/**'
- '.github/workflows/ci-binary-config-checker.yml'

env:
NETWORK: mainnet
Expand All @@ -31,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [custom-linux]
platform: [arc-ubuntu-20.04]

runs-on: ${{ matrix.platform }}
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-build-ts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
paths:
- "ts-packages/**"
- "sdk/typescript/**"
- ".github/workflows/ci-build-ts.yml"

jobs:
build:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-build-upload-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
- 'tools/nym-nr-query/**'
- 'tools/ts-rs-cli/**'
- 'Cargo.toml'
- '.github/workflows/ci-build.yml'
pull_request:
paths:
- 'clients/**'
Expand All @@ -35,14 +36,15 @@ on:
- 'tools/nym-nr-query/**'
- 'tools/ts-rs-cli/**'
- 'Cargo.toml'
- '.github/workflows/ci-build.yml'
workflow_dispatch:

jobs:
build:
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
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ci-cargo-deny.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-contracts-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-contracts-upload-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
paths:
- 'common/**'
- 'contracts/**'
- '.github/workflows/ci-contracts-upload-binaries.yml'

env:
NETWORK: mainnet
Expand All @@ -15,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ ubuntu-20.04 ]
platform: arc-ubuntu-20.04

runs-on: ${{ matrix.platform }}
env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-lint-typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- "nym-wallet/src/**"
- "nym-wallet/package.json"
- "explorer/**"
- ".github/workflows/ci-lint-typescript.yml"

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-nym-network-explorer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
paths:
- 'explorer/**'
- '.github/workflows/ci-nym-network-explorer.yml'

defaults:
run:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci-nym-wallet-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-nym-wallet-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
paths:
- 'nym-wallet/**'
- '.github/workflows/ci-nym-wallet-storybook.yml'

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-sdk-docs-typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
paths:
- "sdk/typescript/**"
- "wasm/**"
- '.github/workflows/ci-sdk-docs-typescript.yml'

jobs:
build:
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/ci-sdk-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 85758be

Please sign in to comment.