Skip to content

Commit 893f19f

Browse files
cknittcknitt
authored
Revert "Disable OPAM cache for now (#7489)" (#7514)
1 parent 01ee097 commit 893f19f

File tree

1 file changed

+72
-72
lines changed

1 file changed

+72
-72
lines changed

‎.github/workflows/ci.yml

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -137,32 +137,32 @@ jobs:
137137
shell: bash
138138

139139
# matrix.ocaml_compiler may contain commas
140-
# - name: Get OPAM cache key
141-
# shell: bash
142-
# run: echo "opam_cache_key=opam-env-v8-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('*.opam') }}" | sed 's/,/-/g' >> $GITHUB_ENV
140+
- name: Get OPAM cache key
141+
shell: bash
142+
run: echo "opam_cache_key=opam-env-v8-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('*.opam') }}" | sed 's/,/-/g' >> $GITHUB_ENV
143143

144-
# - name: Restore OPAM environment
145-
# id: cache-opam-env
146-
# uses: actions/cache/restore@v4
147-
# with:
148-
# path: |
149-
# ${{ runner.tool_cache }}/opam
150-
# ~/.opam
151-
# _opam
152-
# .opam-path
153-
# D:\cygwin
154-
# D:\.opam
155-
# key: ${{ env.opam_cache_key }}
144+
- name: Restore OPAM environment
145+
id: cache-opam-env
146+
uses: actions/cache/restore@v4
147+
with:
148+
path: |
149+
${{ runner.tool_cache }}/opam
150+
~/.opam
151+
_opam
152+
.opam-path
153+
D:\cygwin
154+
D:\.opam
155+
key: ${{ env.opam_cache_key }}
156156

157157
- name: Use OCaml ${{matrix.ocaml_compiler}}
158158
uses: ocaml/[email protected]
159-
# if: steps.cache-opam-env.outputs.cache-hit != 'true'
159+
if: steps.cache-opam-env.outputs.cache-hit != 'true'
160160
with:
161161
ocaml-compiler: ${{matrix.ocaml_compiler}}
162162
opam-pin: false
163163

164164
- name: Get OPAM executable path
165-
# if: steps.cache-opam-env.outputs.cache-hit != 'true'
165+
if: steps.cache-opam-env.outputs.cache-hit != 'true'
166166
uses: actions/github-script@v7
167167
with:
168168
script: |
@@ -174,63 +174,63 @@ jobs:
174174
console.log('stored path to .opam-path');
175175
176176
- name: Install OPAM dependencies
177-
# if: steps.cache-opam-env.outputs.cache-hit != 'true'
177+
if: steps.cache-opam-env.outputs.cache-hit != 'true'
178178
run: opam install . --deps-only --with-test
179179

180-
# - name: Cache OPAM environment
181-
# # if: steps.cache-opam-env.outputs.cache-hit != 'true'
182-
# uses: actions/cache/save@v4
183-
# with:
184-
# path: |
185-
# ${{ runner.tool_cache }}/opam
186-
# ~/.opam
187-
# _opam
188-
# .opam-path
189-
# D:\cygwin
190-
# D:\.opam
191-
# key: ${{ env.opam_cache_key }}
192-
193-
# - name: Use cached OPAM environment
194-
# if: steps.cache-opam-env.outputs.cache-hit == 'true'
195-
# run: |
196-
# # https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/installer.ts#L33
197-
# echo "OPAMVERBOSE=$RUNNER_DEBUG" >> "$GITHUB_ENV"
198-
# echo "OPAMCOLOR=always" >> "$GITHUB_ENV"
199-
# echo "OPAMCONFIRMLEVEL=unsafe-yes" >> "$GITHUB_ENV"
200-
# echo "OPAMERRLOGLEN=0" >> "$GITHUB_ENV"
201-
# echo "OPAMPRECISETRACKING=1" >> "$GITHUB_ENV"
202-
# echo "OPAMYES=1" >> "$GITHUB_ENV"
203-
204-
# if [[ "$RUNNER_OS" != "Windows" ]]; then
205-
# echo "OPAMROOT=$HOME/.opam" >> "$GITHUB_ENV"
206-
# else
207-
# echo "OPAMROOT=D:\\.opam" >> "$GITHUB_ENV"
208-
# fi
209-
210-
# OPAM_PATH="$(cat .opam-path)"
211-
# chmod +x "$OPAM_PATH"
212-
# dirname "$OPAM_PATH" >> "$GITHUB_PATH"
213-
214-
# if [[ "$RUNNER_OS" == "Windows" ]]; then
215-
# fsutil behavior query SymlinkEvaluation
216-
# fsutil behavior set symlinkEvaluation R2L:1 R2R:1
217-
# fsutil behavior query SymlinkEvaluation
218-
219-
# CYGWIN="winsymlinks:native"
220-
# CYGWIN_ROOT="D:\\cygwin"
221-
# CYGWIN_ROOT_BIN="D:\\cygwin\\bin"
222-
# CYGWIN_ROOT_WRAPPERBIN="D:\\cygwin\\wrapperbin"
223-
224-
# echo "HOME=$USERPROFILE" >> "$GITHUB_ENV"
225-
# echo "MSYS=winsymlinks:native" >> "$GITHUB_ENV"
226-
# echo "CYGWIN=$CYGWIN" >> "$GITHUB_ENV"
227-
# echo "CYGWIN_ROOT=$CYGWIN_ROOT" >> "$GITHUB_ENV"
228-
# echo "CYGWIN_ROOT_BIN=$CYGWIN_ROOT_BIN" >> "$GITHUB_ENV"
229-
# echo "CYGWIN_ROOT_WRAPPERBIN=$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_ENV"
230-
231-
# echo "$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_PATH"
232-
# fi
233-
# shell: bash
180+
- name: Cache OPAM environment
181+
if: steps.cache-opam-env.outputs.cache-hit != 'true'
182+
uses: actions/cache/save@v4
183+
with:
184+
path: |
185+
${{ runner.tool_cache }}/opam
186+
~/.opam
187+
_opam
188+
.opam-path
189+
D:\cygwin
190+
D:\.opam
191+
key: ${{ env.opam_cache_key }}
192+
193+
- name: Use cached OPAM environment
194+
if: steps.cache-opam-env.outputs.cache-hit == 'true'
195+
run: |
196+
# https://github.com/ocaml/setup-ocaml/blob/b2105f9/packages/setup-ocaml/src/installer.ts#L33
197+
echo "OPAMVERBOSE=$RUNNER_DEBUG" >> "$GITHUB_ENV"
198+
echo "OPAMCOLOR=always" >> "$GITHUB_ENV"
199+
echo "OPAMCONFIRMLEVEL=unsafe-yes" >> "$GITHUB_ENV"
200+
echo "OPAMERRLOGLEN=0" >> "$GITHUB_ENV"
201+
echo "OPAMPRECISETRACKING=1" >> "$GITHUB_ENV"
202+
echo "OPAMYES=1" >> "$GITHUB_ENV"
203+
204+
if [[ "$RUNNER_OS" != "Windows" ]]; then
205+
echo "OPAMROOT=$HOME/.opam" >> "$GITHUB_ENV"
206+
else
207+
echo "OPAMROOT=D:\\.opam" >> "$GITHUB_ENV"
208+
fi
209+
210+
OPAM_PATH="$(cat .opam-path)"
211+
chmod +x "$OPAM_PATH"
212+
dirname "$OPAM_PATH" >> "$GITHUB_PATH"
213+
214+
if [[ "$RUNNER_OS" == "Windows" ]]; then
215+
fsutil behavior query SymlinkEvaluation
216+
fsutil behavior set symlinkEvaluation R2L:1 R2R:1
217+
fsutil behavior query SymlinkEvaluation
218+
219+
CYGWIN="winsymlinks:native"
220+
CYGWIN_ROOT="D:\\cygwin"
221+
CYGWIN_ROOT_BIN="D:\\cygwin\\bin"
222+
CYGWIN_ROOT_WRAPPERBIN="D:\\cygwin\\wrapperbin"
223+
224+
echo "HOME=$USERPROFILE" >> "$GITHUB_ENV"
225+
echo "MSYS=winsymlinks:native" >> "$GITHUB_ENV"
226+
echo "CYGWIN=$CYGWIN" >> "$GITHUB_ENV"
227+
echo "CYGWIN_ROOT=$CYGWIN_ROOT" >> "$GITHUB_ENV"
228+
echo "CYGWIN_ROOT_BIN=$CYGWIN_ROOT_BIN" >> "$GITHUB_ENV"
229+
echo "CYGWIN_ROOT_WRAPPERBIN=$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_ENV"
230+
231+
echo "$CYGWIN_ROOT_WRAPPERBIN" >> "$GITHUB_PATH"
232+
fi
233+
shell: bash
234234

235235
- name: Compiler build state key
236236
id: compiler-build-state-key

0 commit comments

Comments
 (0)