CI: Re-enable macOS build for crux-mir

Fixes #1050.
GaloisInc · Jul 3, 2023 · d4f5074 · d4f5074
1 parent 537dfbe
commit d4f5074
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.github/Dockerfile-crux-mir b/.github/Dockerfile-crux-mir
@@ -2,8 +2,6 @@ FROM rust:1.46.0 AS mir_json
 
 ADD dependencies/mir-json /mir-json
 WORKDIR /mir-json
-# Work around https://github.com/rust-lang/cargo/issues/10303
-ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 RUN rustup toolchain install nightly-2020-03-22 --force
 RUN rustup component add --toolchain nightly-2020-03-22 rustc-dev
 RUN rustup default nightly-2020-03-22

diff --git a/.github/workflows/crux-mir-build.yml b/.github/workflows/crux-mir-build.yml
@@ -20,8 +20,6 @@ env:
   # (symptom: "No suitable image found ... unknown file type, first
   # eight bytes: 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00")
   CACHE_VERSION: 4
-  # Work around https://github.com/rust-lang/cargo/issues/10303
-  CARGO_NET_GIT_FETCH_WITH_CLI: true
 
 jobs:
   config:
@@ -65,13 +63,10 @@ jobs:
         os: [ubuntu-22.04]
         cabal: ["3.8.1.0"]
         ghc: ["8.10.7", "9.2.7", "9.4.4"]
-        # include:
-          # Disable the macOS build for now due to
-          # https://github.com/GaloisInc/crucible/issues/1050
-          #
-          # - os: macos-12
-          #   cabal: 3.8.1.0
-          #   ghc: 9.2.4
+        include:
+          - os: macos-12
+            cabal: 3.8.1.0
+            ghc: 9.2.7
 
           # We want Windows soon, but it doesn't need to be now
     name: crux-mir - GHC v${{ matrix.ghc }} - ${{ matrix.os }}