Revert "chore: move opam files to opam/ directory (#9383)"

This reverts commit 57fa044.

Signed-off-by: Etienne Millon <[email protected]>

.github/workflows/workflow.yml

@@ -26,7 +26,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         # Please keep the list in sync with the minimal version of OCaml in
-        # dune-project, opam/dune.opam.template and bootstrap.ml
+        # dune-project, dune.opam.template and bootstrap.ml
         #
         # We don't run tests on all versions of the Windows environment and on
         # 4.02.x and 4.07.x in other environments
@@ -80,12 +80,9 @@ jobs:
         run: |
           git config --global user.name github-actions[bot]
           git config --global user.email github-actions[bot]@users.noreply.github.com
-          
-      - name: Pin opam packages
-        run: opam pin . --no-action -y
 
       # Install ocamlfind-secondary and ocaml-secondary-compiler, if needed
-      - run: opam install dune --deps-only --with-test
+      - run: opam install ./dune.opam --deps-only --with-test
 
       - name: Install system deps on macOS
         run: brew install coreutils pkg-config file
@@ -105,7 +102,7 @@ jobs:
         if: ${{ matrix.os != 'windows-latest' && matrix.skip_test == false }}
 
       - name: Install deps on Win32
-        run: opam install dune-configurator --deps-only --with-test
+        run: opam install ./dune-configurator.opam --deps-only --with-test
         if: ${{ matrix.os == 'windows-latest' && matrix.skip_test == false }}
 
       - name: Run test suite on Unix
@@ -117,7 +114,7 @@ jobs:
         if: ${{ matrix.os == 'windows-latest' && matrix.skip_test == false }}
 
       - name: Build configurator
-        run: opam install dune-configurator
+        run: opam install ./dune-configurator.opam
         if: ${{ matrix.configurator == true }}
 
   dkml-current:
@@ -194,7 +191,7 @@ jobs:
           git config --global user.email github-actions[bot]@users.noreply.github.com
 
       # Install ocamlfind-secondary and ocaml-secondary-compiler, if needed
-      - run: opam install dune --deps-only --with-test
+      - run: opam install ./dune.opam --deps-only --with-test
 
       - name: Install deps on Unix
         run: |

bench/monorepo/bench.Dockerfile

@@ -153,7 +153,6 @@ COPY --chown=user:users otherlibs otherlibs
 COPY --chown=user:users vendor vendor
 COPY --chown=user:users dune-project dune-project
 COPY --chown=user:users dune-file dune-file
-COPY --chown=user:users opam opam
 RUN . ~/.profile && dune build bin/main.exe --release
 
 # Switch to the benchmark project

opam/chrome-trace.opam → chrome-trace.opam

@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08.0"}
   "odoc" {with-doc}
 ]

ci/build-test.sh

@@ -59,11 +59,8 @@ echo ======== Set git user
 git config --global user.name 'github-actions[bot]'
 git config --global user.email 'github-actions[bot]@users.noreply.github.com'
 
-echo ======== Pin opam packages
-opamrun pin add . --no-action -y
-
 echo ======== Install ocamlfind-secondary and ocaml-secondary-compiler, if needed
-opamrun install dune --deps-only --with-test
+opamrun install ./dune.opam --deps-only --with-test
 
 case "$dkml_host_abi" in
 darwin_*)
@@ -101,7 +98,7 @@ windows_*)
     fi
 
     echo ======== Install deps on Win32
-    opamrun install dune-configurator --deps-only --with-test --yes
+    opamrun install ./dune-configurator.opam --deps-only --with-test --yes
 
     echo ======== Run test suite on Win32
     opamrun exec -- make test-windows
@@ -124,4 +121,4 @@ windows_*)
 esac
 
 echo ======== Build configurator
-opamrun install dune-configurator --yes
+opamrun install ./dune-configurator.opam --yes

opam/dune-action-plugin.opam → dune-action-plugin.opam

@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "dune-glob" {= version}
   "csexp" {>= "1.5.0"}
   "ppx_expect" {with-test}

opam/dune-build-info.opam → dune-build-info.opam

@@ -16,7 +16,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]

opam/dune-configurator.opam → dune-configurator.opam

@@ -18,7 +18,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.04.0"}
   "base-unix"
   "csexp" {>= "1.5.0"}

dune-file

@@ -2,6 +2,48 @@
 
 (data_only_dirs _boot)
 
+(rule
+ (copy dune-private-libs.opam.template dune-configurator.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-glob.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-action-plugin.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-build-info.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-site.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-rpc.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template stdune.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dyn.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template ordering.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template dune-rpc-lwt.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template fiber.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template xdg.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template ocamlc-loc.opam.template))
+
+(rule
+ (copy dune-private-libs.opam.template chrome-trace.opam.template))
+
 (env
  (_
   (flags :standard -alert -unstable)

opam/dune-glob.opam → dune-glob.opam

@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "stdune" {= version}
   "dyn"
   "ordering"

opam/dune-private-libs.opam → dune-private-libs.opam

@@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "csexp" {>= "1.5.0"}
   "pp" {>= "1.1.0"}
   "dyn" {= version}

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.8)
+(lang dune 3.5)
 ;          ^^^
 ; When changing the version, don't forget to regenerate *.opam files
 ; by running [dune build].
@@ -10,8 +10,6 @@
 
 (strict_package_deps false)
 
-(opam_file_location inside_opam_directory)
-
 ; Reserved for Dune itself. This is to help with the bootstrap
 (using dune-bootstrap-info 0.1)
 

opam/dune-rpc-lwt.opam → dune-rpc-lwt.opam

@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "dune-rpc" {= version}
   "result" {>= "1.5"}
   "csexp" {>= "1.5.0"}

opam/dune-rpc.opam → dune-rpc.opam

@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "csexp"
   "ordering"
   "dyn"

opam/dune-site.opam → dune-site.opam

@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "dune-private-libs" {= version}
   "odoc" {with-doc}
 ]

opam/dyn.opam → dyn.opam

@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08.0"}
   "ordering" {= version}
   "pp" {>= "1.1.0"}

opam/ocamlc-loc.opam → ocamlc-loc.opam

@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08.0"}
   "dyn" {= version}
   "odoc" {with-doc}

opam/ordering.opam → ordering.opam

@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08.0"}
   "odoc" {with-doc}
 ]

opam/stdune.opam → stdune.opam

@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08.0"}
   "base-unix"
   "dyn" {= version}

opam/xdg.opam → xdg.opam

@@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]