Skip to content

Commit 649e2b1

Browse files
authored
opam: move all opam files to the opam subdir (#6402)
This cleans up the root folder It's unclear whether this change is compatible with how the docs workflow uses setup-ocaml. I've updated it to use it the same way as the other workflows (except it doesn't install the test dependencies) This will need changes in the sync-xapi-metadata tool of xs-opam, but I can fix that later
2 parents 7991e12 + 08fc9cf commit 649e2b1

100 files changed

Lines changed: 11 additions & 2 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/docs.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,23 @@ jobs:
3131
- name: Update Ubuntu repositories
3232
run: sudo apt-get update
3333

34+
# We set DUNE_CACHE_STORAGE_MODE, it is required for dune cache to work inside opam for now,
35+
# otherwise it gets EXDEV and considers it a cache miss
3436
- name: Use ocaml
35-
uses: ocaml/setup-ocaml@v2
37+
uses: ocaml/setup-ocaml@v3
3638
with:
3739
ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }}
3840
opam-repositories: |
3941
xs-opam: ${{ steps.dotenv.outputs.repository }}
42+
dune-cache: true
43+
opam-pin: false
44+
cache-prefix: v3-${{ steps.system-info.outputs.name }}-${{ steps.system-info.outputs.release }}
45+
env:
46+
DUNE_CACHE_STORAGE_MODE: copy
4047

4148
- name: Install dependencies
42-
run: opam pin list --short | xargs opam install --deps-only -v
49+
shell: bash
50+
run: opam install . --deps-only -v
4351

4452
- name: Generate xapi-storage docs
4553
run: |

dune-project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
(formatting (enabled_for ocaml))
44
(using menhir 2.0)
55
(using directory-targets 0.1)
6+
(opam_file_location inside_opam_directory)
67

78
(cram enable)
89
(implicit_transitive_deps false)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)