review comments

.github/workflows/ci.yml

@@ -8,9 +8,6 @@ on:
   pull_request:
   merge_group:
 
-env:
-  CARGO_TERM_COLOR: always
-
 jobs:
   cargo_nextest:
     name: "Cargo Nextest (${{matrix.name}})"
@@ -24,19 +21,21 @@ jobs:
             cache_id: linux
             os: ubuntu-22.04-16core
             flags: ""
+            run_integ_tests: true
           - name: Linux Nightly
             id: linux-nightly
             cache_id: linux
             os: ubuntu-22.04-16core
             flags: "--features nightly,test_features"
+            run_integ_tests: true
           - name: MacOS
             id: macos
             cache_id: macos
             os: macos-latest-xlarge
             # FIXME: some of these tests don't work very well on MacOS at the moment. Should fix
             # them at earliest convenience :)
-            # Note that integration-tests are disabled at the step running them in the job below.
             flags: "--exclude node-runtime --exclude runtime-params-estimator --exclude near-network --exclude estimator-warehouse"
+            run_integ_tests: false
     timeout-minutes: 90
     steps:
       # Some of the tests allocate really sparse maps, so heuristic-based overcommit limits are not
@@ -78,13 +77,13 @@ jobs:
 
       # Run integration tests
       - run: cargo nextest run --locked --package integration-tests --cargo-profile quick-release --profile ci ${{ matrix.flags }}
-        if: matrix.id != 'macos'
+        if: matrix.run_integ_tests
         env:
           RUST_BACKTRACE: short
       - run: cargo llvm-cov report --profile quick-release --codecov --output-path integration-tests.json
-        if: matrix.id != 'macos'
+        if: matrix.run_integ_tests
       - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
-        if: matrix.id != 'macos'
+        if: matrix.run_integ_tests
         with:
           files: integration-tests.json
           fail_ci_if_error: true