Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): Migrate jobs to new github runners #2742

Merged
merged 18 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build-contract-verifier-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
name: Build and Push Docker Images
env:
IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
runs-on: ${{ fromJSON('["matterlabs-ci-runner", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
runs-on: ${{ fromJSON('["matterlabs-ci-runner-high-performance", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
strategy:
matrix:
components:
Expand Down Expand Up @@ -149,7 +149,8 @@ jobs:

create_manifest:
name: Create release manifest
runs-on: matterlabs-ci-runner
# TODO: After migraton switch to CI
runs-on: matterlabs-default-infra-runners
needs: build-images
if: ${{ inputs.action == 'push' }}
strategy:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-core-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
name: Build and Push Docker Images
env:
IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}${{ (inputs.en_alpha_release && matrix.components == 'external-node') && '-alpha' || '' }}
runs-on: ${{ fromJSON('["matterlabs-ci-runner", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
runs-on: ${{ fromJSON('["matterlabs-ci-runner-high-performance", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
strategy:
matrix:
components:
Expand Down Expand Up @@ -158,7 +158,8 @@ jobs:

create_manifest:
name: Create release manifest
runs-on: matterlabs-ci-runner
# TODO: After migraton switch to CI
runs-on: matterlabs-default-infra-runners
needs: build-images
if: ${{ inputs.action == 'push' }}
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-local-node-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
build-images:
name: Local Node - Build and Push Docker Image
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-high-performance]
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-prover-fri-gpu-gar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
jobs:
build-gar-prover-fri-gpu:
name: Build prover FRI GPU GAR
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-high-performance]
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-prover-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"
ERA_BELLMAN_CUDA_RELEASE: ${{ inputs.ERA_BELLMAN_CUDA_RELEASE }}
CUDA_ARCH: ${{ inputs.CUDA_ARCH }}
runs-on: [ matterlabs-ci-runner ]
runs-on: [ matterlabs-ci-runner-high-performance ]
strategy:
matrix:
component:
Expand Down Expand Up @@ -171,7 +171,8 @@ jobs:
env:
IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
PROTOCOL_VERSION: ${{ needs.build-images.outputs.protocol_version }}
runs-on: matterlabs-ci-runner
# TODO: After migraton switch to CI
runs-on: matterlabs-default-infra-runners
if: ${{ inputs.action == 'push' }}
strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-tee-prover-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
name: Build and Push Docker Images
env:
IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-high-performance]
steps:
- uses: actions/checkout@v4
if: ${{ github.event_name == 'workflow_dispatch' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-common-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:

jobs:
build:
runs-on: [matterlabs-ci-runner]
runs-on: matterlabs-ci-runner-highmem-long
env:
RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci-core-lint-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ on:

jobs:
code_lint:
runs-on: [ matterlabs-ci-runner ]

runs-on: matterlabs-ci-runner-highmem-long
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-core-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: lint
uses: ./.github/workflows/ci-core-lint-reusable.yml
unit-tests:
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-highmem-long]

steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
ci_run zk f cargo test --release -p vm-benchmark --bench oneshot --bench batch

loadtest:
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-high-performance]
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
env:
SERVER_COMPONENTS: "api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,vm_runner_bwip,vm_playground,da_dispatcher${{ matrix.consensus && ',consensus' || '' }}${{ matrix.base_token == 'Custom' && ',base_token_ratio_persister' || '' }}"

runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-highmem-long]
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
Expand Down Expand Up @@ -317,7 +317,7 @@ jobs:
consensus: [false, true]
base_token: ["Eth", "Custom"]
deployment_mode: ["Rollup", "Validium"]
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-highmem-long]

env:
SERVER_COMPONENTS: "api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,vm_runner_bwip,da_dispatcher${{ matrix.consensus && ',consensus' || '' }}${{ matrix.base_token == 'Custom' && ',base_token_ratio_persister' || '' }}"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-docs-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:

jobs:
lint:
runs-on: [matterlabs-ci-runner]
# TODO: After migraton switch to CI
runs-on: matterlabs-default-infra-runners

steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-prover-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_call:
jobs:
lint:
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-highmem-long]
env:
RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"

Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:
run: ci_run bash -c "cd prover && cargo fmt --check"

unit-tests:
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-highmem-long]
env:
RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"

Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/ci-zk-toolbox-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ jobs:
uses: ./.github/workflows/ci-core-lint-reusable.yml

build:
runs-on: [ matterlabs-ci-runner ]

runs-on: [matterlabs-ci-runner-high-performance]
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
Expand Down Expand Up @@ -48,9 +47,8 @@ jobs:
compression-level: 0

tests:
runs-on: [ matterlabs-ci-runner ]
needs: [ build ]

runs-on: [matterlabs-ci-runner-high-performance]
needs: [build]
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
Expand Down Expand Up @@ -83,7 +81,7 @@ jobs:
ci_run git config --global --add safe.directory /usr/src/zksync
ci_run git config --global --add safe.directory /usr/src/zksync/contracts/system-contracts
ci_run git config --global --add safe.directory /usr/src/zksync/contracts

ci_run zk_inception ecosystem init --deploy-paymaster --deploy-erc20 \
--deploy-ecosystem --l1-rpc-url=http://reth:8545 \
--server-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
Expand Down Expand Up @@ -115,7 +113,6 @@ jobs:
--prover-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
--prover-db-name=zksync_prover_localhost_rollup


- name: Run server
run: |
ci_run zk_inception server --ignore-prerequisites &>server.log &
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-please-cargo-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
name: release-please-update-cargo-lock
jobs:
update_cargo_lock:
# TODO: After migraton switch to CI
runs-on: [matterlabs-default-infra-runners]

steps:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release-stable-en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ on:

jobs:
release:
runs-on: [matterlabs-ci-runner]
# TODO: After migraton switch to CI
runs-on: [matterlabs-default-infra-runners]
steps:
- name: Login to Docker registries
run: |
Expand Down Expand Up @@ -42,7 +43,7 @@ jobs:
docker pull $alpha_tag
docker tag $alpha_tag $tag
docker push $tag

platform_tags+=" --amend $tag"
done
for manifest in "${repo}:${tag_name}" "${repo}:2.0-${tag_name}"; do
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vm-perf-comparison.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
vm-benchmarks:
name: Run VM benchmarks
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-highmem-long]

steps:
- name: checkout base branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vm-perf-to-prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency: vm-benchmarks
jobs:
vm-benchmarks:
name: Run VM benchmarks
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-highmem-long]

steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/zk-environment-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
fail-fast: false
matrix:
include:
- runner: matterlabs-ci-runner
- runner: matterlabs-ci-runner-high-performance
arch: amd64
- runner: matterlabs-ci-runner-arm
arch: arm64
Expand Down Expand Up @@ -129,7 +129,8 @@ jobs:
packages: write
contents: read
needs: [changed_files, get_short_sha, zk_environment]
runs-on: matterlabs-ci-runner
# TODO: After migraton switch to CI
runs-on: [matterlabs-default-infra-runners]
steps:
- name: Login to DockerHub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
Expand Down Expand Up @@ -188,7 +189,7 @@ jobs:
packages: write
contents: read
needs: changed_files
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-ci-runner-high-performance]
strategy:
matrix:
cuda_version: ['11_8', '12_0']
Expand Down
1 change: 1 addition & 0 deletions core/tests/ts-integration/jest.config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"maxWorkers": "70%",
"reporters": [
"default",
"github-actions"
Expand Down
2 changes: 1 addition & 1 deletion core/tests/ts-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"private": true,
"scripts": {
"test": "zk f jest --forceExit --testTimeout 60000",
"test": "zk f jest --detectOpenHandles --verbose --testTimeout 60000",
"long-running-test": "zk f jest",
"fee-test": "RUN_FEE_TEST=1 zk f jest -- fees.test.ts",
"api-test": "zk f jest -- api/web3.test.ts api/debug.test.ts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub fn run(shell: &Shell, args: IntegrationArgs) -> anyhow::Result<()> {
build_repository(shell, &ecosystem_config)?;
build_test_contracts(shell, &ecosystem_config)?;

let mut command = cmd!(shell, "yarn jest --forceExit --testTimeout 60000")
let mut command = cmd!(shell, "yarn jest --detectOpenHandles --testTimeout 60000")
.env("CHAIN_NAME", ecosystem_config.default_chain);

if args.external_node {
Expand Down
Loading