From 27c3a6597d57c2d3475e54bd24efa6b2cef6d803 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Wed, 25 Oct 2023 20:26:27 -0300 Subject: [PATCH 1/2] revert #6825 --- .github/workflows/ci-unit-tests-os.patch.yml | 2 +- .github/workflows/ci-unit-tests-os.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-unit-tests-os.patch.yml b/.github/workflows/ci-unit-tests-os.patch.yml index 549f1809a51..4a97eb719f5 100644 --- a/.github/workflows/ci-unit-tests-os.patch.yml +++ b/.github/workflows/ci-unit-tests-os.patch.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest] rust: [stable, beta] features: [""] exclude: diff --git a/.github/workflows/ci-unit-tests-os.yml b/.github/workflows/ci-unit-tests-os.yml index bbfa6dc1d6e..b3b0b15edc3 100644 --- a/.github/workflows/ci-unit-tests-os.yml +++ b/.github/workflows/ci-unit-tests-os.yml @@ -75,7 +75,7 @@ jobs: matrix: # TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801 # TODO: macOS tests were removed for now, see https://github.com/ZcashFoundation/zebra/issues/6824 - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest] rust: [stable, beta] # TODO: When vars.EXPERIMENTAL_FEATURES has features in it, add it here. # Or work out a way to trim the space from the variable: GitHub doesn't allow empty variables. From 6b69028f15d8cab333ca0e97d6f7526eea85a53a Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Wed, 25 Oct 2023 21:52:24 -0300 Subject: [PATCH 2/2] remove todo comment from CI --- .github/workflows/ci-unit-tests-os.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci-unit-tests-os.yml b/.github/workflows/ci-unit-tests-os.yml index b3b0b15edc3..c433bf82163 100644 --- a/.github/workflows/ci-unit-tests-os.yml +++ b/.github/workflows/ci-unit-tests-os.yml @@ -74,7 +74,6 @@ jobs: fail-fast: false matrix: # TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801 - # TODO: macOS tests were removed for now, see https://github.com/ZcashFoundation/zebra/issues/6824 os: [ubuntu-latest, macos-latest] rust: [stable, beta] # TODO: When vars.EXPERIMENTAL_FEATURES has features in it, add it here.