@@ -130,31 +130,13 @@ jobs:
130130 with :
131131 coq_version : ${{ matrix.env.DOCKER_COQ_VERSION }}
132132 ocaml_version : ${{ matrix.env.DOCKER_OCAML_VERSION }}
133- export : CI ALLOW_DIFF COQCHKEXTRAFLAGS GITHUB_STEP_SUMMARY COQ_IMAGE
133+ export : CI ALLOW_DIFF COQCHKEXTRAFLAGS GITHUB_STEP_SUMMARY COQ_IMAGE GITHUB_ENV
134134 custom_script : |
135- printf "'%s'\n" "${COQ_IMAGE}"
136- printf "%s" "${COQ_IMAGE}" > .coqimage
137- - name : Set COQ_IMAGE
138- run : |
139- COQ_IMAGE="$(cat .coqimage)"
140- # N.B. This block can be removed once https://github.com/coq-community/docker-coq-action/pull/89 is merged
141- # we can just do `echo "COQ_IMAGE=$(cat .coqimage)" >> $GITHUB_ENV` then
142- if [ -z "${COQ_IMAGE}" ]; then
143- echo "::warning::.coqimage is empty, parsing docker images for coqorg/coq:.*${{ matrix.env.DOCKER_COQ_VERSION }}.*"
144- echo "::group::docker images"
145- docker images
146- echo "::endgroup::"
147- echo "::group::docker images --format '{{.Repository}}:{{.Tag}}'"
148- docker images --filter "reference=coqorg/coq*" --format "{{.Repository}}:{{.Tag}}"
149- echo "::endgroup::"
150- COQ_IMAGE="$(docker images --filter "reference=coqorg/coq*" --format "{{.Repository}}:{{.Tag}}" | grep -o 'coqorg/coq:.*${{ matrix.env.DOCKER_COQ_VERSION }}.*')"
151- fi
152- echo "COQ_IMAGE=${COQ_IMAGE}" >> $GITHUB_ENV
135+ echo "COQ_IMAGE=${COQ_IMAGE}" | tee -a $GITHUB_ENV
153136 - run : docker save "$COQ_IMAGE" -o image.tar
154137 - name : Set coq_image_name Output to ${{ runner.os }}-docker-${{ hashFiles('image.tar') }}
155138 id : set-output-step
156- run : |
157- echo "coq_image_name=${{ runner.os }}-docker-${{ hashFiles('image.tar') }}" >> $GITHUB_OUTPUT
139+ run : echo "coq_image_name=${{ runner.os }}-docker-${{ hashFiles('image.tar') }}" >> $GITHUB_OUTPUT
158140 - name : Cache Docker image
159141 uses : actions/cache@v3
160142 with :
0 commit comments