From f38a15c8dfaa5262ec531dd29e718794677beb09 Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Thu, 16 Jun 2022 22:41:45 -0400 Subject: [PATCH 1/3] fix(build): add `beta` rust to CI --- .github/workflows/continous-integration-os.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continous-integration-os.yml b/.github/workflows/continous-integration-os.yml index ba29bdba073..8a935b296f2 100644 --- a/.github/workflows/continous-integration-os.yml +++ b/.github/workflows/continous-integration-os.yml @@ -53,7 +53,7 @@ jobs: matrix: # TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801 os: [ubuntu-latest, macos-latest] - rust: [stable] + rust: [stable, beta] steps: - uses: actions/checkout@v3.0.2 @@ -152,7 +152,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [stable] + rust: [stable, beta] steps: - uses: actions/checkout@v3.0.2 From d79e10f180a6611a3d07298a621beb51283127e2 Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Mon, 20 Jun 2022 19:19:21 -0400 Subject: [PATCH 2/3] fix(ci): remove macos-latest with beta Rust combination --- .github/workflows/continous-integration-os.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/continous-integration-os.yml b/.github/workflows/continous-integration-os.yml index 8a935b296f2..93a0e287207 100644 --- a/.github/workflows/continous-integration-os.yml +++ b/.github/workflows/continous-integration-os.yml @@ -54,6 +54,13 @@ jobs: # TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801 os: [ubuntu-latest, macos-latest] rust: [stable, beta] + # We're excluding macOS for the following reasons: + # - the concurrent macOS runner limit is much lower than the Linux limit + # - macOS is slower than Linux, and shouldn't have a build or test difference with Linux + # - macOS is a second-tier Zebra support platform + exclude: + - os: macos-latest + rust: beta steps: - uses: actions/checkout@v3.0.2 From 30f5708ccd545c46eabcf50c857b1b81a8ba6023 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 22 Jun 2022 13:50:49 +1000 Subject: [PATCH 3/3] Remove redundant fake activation heights OS job --- .../workflows/continous-integration-os.yml | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/.github/workflows/continous-integration-os.yml b/.github/workflows/continous-integration-os.yml index d590417a34b..a6758c727e2 100644 --- a/.github/workflows/continous-integration-os.yml +++ b/.github/workflows/continous-integration-os.yml @@ -153,47 +153,6 @@ jobs: # Note: this only runs the zebrad acceptance tests, because re-running all the test binaries is slow on Windows args: --verbose --package zebrad --test acceptance -- --nocapture --include-ignored sync_large_checkpoints_ - test-fake-activation-heights: - name: Test ${{ matrix.rust }} zebra-state with fake activation heights on ubuntu-latest - timeout-minutes: 60 - runs-on: ubuntu-latest - strategy: - matrix: - rust: [stable, beta] - - steps: - - uses: actions/checkout@v3.0.2 - with: - persist-credentials: false - - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - profile: minimal - override: true - - - uses: Swatinem/rust-cache@v1 - - - name: cargo fetch - uses: actions-rs/cargo@v1.0.3 - with: - command: fetch - - # This test changes zebra-chain's activation heights, - # which can recompile all the Zebra crates, - # so we want its build products to be cached separately. - # - # Also, we don't want to accidentally use the fake heights in other tests. - - name: Run tests with fake activation heights - uses: actions-rs/cargo@v1.0.3 - env: - TEST_FAKE_ACTIVATION_HEIGHTS: '' - with: - command: test - # Note: this only runs the zebra-state crate tests, - # because re-running all the test binaries can be slow - args: --verbose --package zebra-state --lib -- --nocapture --include-ignored with_fake_activation_heights - build-chain-no-features: name: Build ${{ matrix.rust }} zebra-chain w/o features on ubuntu-latest timeout-minutes: 60