stop using env-based fallbacks for local development

Author: timbertson

.github/workflows/ci.yml

@@ -20,9 +20,9 @@ jobs:
         EOF
     - name: Run tests
       run: "set -eu -o pipefail\nset -x\ndocker run --rm -i \"--volume\" \"$PWD:/cwd\"
-        \"--workdir=/cwd\" \"docker.pkg.github.com/timbertson/dhall-ci/dhall\" bash
-        -eu -o pipefail <<EOF_runInDocker\n  make test\n  if ! git --no-pager diff
-        --patch --exit-code HEAD -- >&2; then\n    set +x\n    echo >&2\n    echo
+        \"--workdir=/cwd\" \"docker.pkg.github.com/timbertson/dhall-ci/dhall:1.37\"
+        bash -eu -o pipefail <<EOF_runInDocker\n  make test\n  if ! git --no-pager
+        diff --patch --exit-code HEAD -- >&2; then\n    set +x\n    echo >&2\n    echo
         '--------------------------------' >&2\n    echo 'Uncommitted changes found,
         please run the following locally and commit the changes:' >&2\n    cat >&2
         <<EOF_diff\n      make test\n    \nEOF_diff\n    exit 1\n  fi\n\nEOF_runInDocker"

generated/.gitattributes

@@ -2,3 +2,4 @@
 # You should NOT edit it manually, your changes will be lost.
 
 generated/* linguist-generated
+.github/workflows/* linguist-generated

maintenance/dependencies/CI.dhall

@@ -1,9 +1,6 @@
-  env:DHALL_CI_OVERRIDE
-?     https://raw.githubusercontent.com/timbertson/dhall-ci/7c77d8a2a790efa4f15bbaa622a57c11625218c9/package.dhall sha256:63b5f3af95e26363c50752bde536e9815e384cec7d8c61f8ded6aefa2d13dd47
-  /\  { Git =
-            env:DHALL_CI_GIT_OVERRIDE
-          ? https://raw.githubusercontent.com/timbertson/dhall-ci-git/5d17b9deb2f6d60d7371a6abab19da8ede1ce781/package.dhall sha256:d771fc8a26226b3b8290a51bb7bb9b41986f187ee051094209ca0250396cef41
-      , Docker =
-            env:DHALL_CI_DOCKER_OVERRIDE
-          ? https://raw.githubusercontent.com/timbertson/dhall-ci-docker/8959f64d12be4d1234cdda3b342627a4aa5d4067/package.dhall sha256:bb0bb542442ff1a99afe8250572a9376f5b6a2ff5e33da8d0ba02e04bcc095d8
-      }
+    https://raw.githubusercontent.com/timbertson/dhall-ci/7c77d8a2a790efa4f15bbaa622a57c11625218c9/package.dhall sha256:63b5f3af95e26363c50752bde536e9815e384cec7d8c61f8ded6aefa2d13dd47
+/\  { Git =
+        https://raw.githubusercontent.com/timbertson/dhall-ci-git/5d17b9deb2f6d60d7371a6abab19da8ede1ce781/package.dhall sha256:d771fc8a26226b3b8290a51bb7bb9b41986f187ee051094209ca0250396cef41
+    , Docker =
+        https://raw.githubusercontent.com/timbertson/dhall-ci-docker/8959f64d12be4d1234cdda3b342627a4aa5d4067/package.dhall sha256:bb0bb542442ff1a99afe8250572a9376f5b6a2ff5e33da8d0ba02e04bcc095d8
+    }

maintenance/dependencies/CI.dhall.local

@@ -0,0 +1,4 @@
+  ../../../dhall-ci/dhall-ci/package.dhall
+/\ { Git = ../../../dhall-ci/dhall-ci-git/package.dhall
+  , Docker = ../../../dhall-ci/dhall-ci-docker/package.dhall
+  }