From 4e1724b8118eeb5586251eb4bb008497fb1cb6fb Mon Sep 17 00:00:00 2001
From: Jason Gross <jgross@mit.edu>
Date: Tue, 16 Apr 2024 11:51:07 -0700
Subject: [PATCH] Attempt to clean up MacOS CI yml a bit

---
 .github/workflows/coq-macos.yml | 68 ++++++++-------------------------
 1 file changed, 15 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/coq-macos.yml b/.github/workflows/coq-macos.yml
index 491c8b348b..fc22cbcbb6 100644
--- a/.github/workflows/coq-macos.yml
+++ b/.github/workflows/coq-macos.yml
@@ -25,6 +25,8 @@ jobs:
       COQ_VERSION: "8.18.0" # pick a version not tested on other platforms
       COQCHKEXTRAFLAGS: ""
       SKIP_BEDROCK2: "0"
+      OPAMYES: "true"
+      OPAMCONFIRMLEVEL: "unsafe-yes"
 
     name: macos
 
@@ -38,56 +40,22 @@ jobs:
         ocaml-compiler: 4.11.1
 
     - name: Install system dependencies
-      run: |
-        set -e
-        brew install gnu-time gnu-sed coreutils
-
-    - name: Install Coq
-      run: |
-        set -e
-        eval $(opam env)
-        opam update
-        opam pin add coq ${COQ_VERSION}
-      env:
-        OPAMYES: "true"
-        OPAMCONFIRMLEVEL: "unsafe-yes"
-
-    - name: Install js_of_ocaml
-      run: |
-        set -e
-        eval $(opam env)
-        opam install js_of_ocaml
-      env:
-        OPAMYES: "true"
-        OPAMCONFIRMLEVEL: "unsafe-yes"
-
+      run: brew install gnu-time gnu-sed coreutils
+    - run: opam update
+    - run: opam pin add coq ${COQ_VERSION}
+    - run: opam install js_of_ocaml
     - name: echo build params
-      run: |
-        eval $(opam env)
-        etc/ci/describe-system-config-macos.sh
+      run: etc/ci/describe-system-config-macos.sh
     - name: deps
-      run: |
-        eval $(opam env)
-        etc/ci/github-actions-make.sh -j2 deps
+      run: opam exec -- etc/ci/github-actions-make.sh -j2 deps
     - name: all
-      run: |
-        eval $(opam env)
-        etc/ci/github-actions-make.sh -j2 all
-
+      run: opam exec -- etc/ci/github-actions-make.sh -j2 all
     - name: install-standalone-unified-ocaml
-      run: |
-        eval $(opam env)
-        etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist
-
+      run: opam exec -- etc/ci/github-actions-make.sh install-standalone-unified-ocaml BINDIR=dist
     - name: install-standalone-js-of-ocaml
-      run: |
-        eval $(opam env)
-        etc/ci/github-actions-make.sh install-standalone-js-of-ocaml
-
+      run: opam exec -- etc/ci/github-actions-make.sh install-standalone-js-of-ocaml
     - name: only-test-amd64-files-lite
-      run: |
-        eval $(opam env)
-        etc/ci/github-actions-make.sh -j2 only-test-amd64-files-lite SLOWEST_FIRST=1
+      run: opam exec -- etc/ci/github-actions-make.sh -j2 only-test-amd64-files-lite SLOWEST_FIRST=1
 
     - name: upload OCaml files
       uses: actions/upload-artifact@v3
@@ -110,17 +78,11 @@ jobs:
         name: standalone-html-macos
         path: fiat-html
     - name: install
-      run: |
-        eval $(opam env)
-        etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_COQSCRIPTS_INCLUDE=1 install install-standalone-ocaml
+      run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_COQSCRIPTS_INCLUDE=1 install install-standalone-ocaml
     - name: install-without-bedrock2
-      run: |
-        eval $(opam env)
-        etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml
+      run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml
     - name: install-dev
-      run: |
-        eval $(opam env)
-        etc/ci/github-actions-make.sh EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml
+      run: opam exec -- etc/ci/github-actions-make.sh EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml
     - name: display timing info
       run: cat time-of-build-pretty.log
     - name: display per-line timing info