From 9c19964f55a0635d98a0ef1bde4255c74e738952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= <code@bnwr.net>
Date: Fri, 9 Jun 2023 09:48:33 +0200
Subject: [PATCH 1/2] Manifest: simplify declaration of protocol test-helpers

---
 manifest/main.ml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index b656998c3d53..0d26e08ec0ec 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -5453,14 +5453,13 @@ let hash = Protocol.hash
     in
     let test_helpers =
       only_if active @@ fun () ->
+      let name = sf "tezos-%s-test-helpers" name_dash in
       public_lib
-        (sf "tezos-%s-test-helpers" name_dash)
+        name
         ~path:
           (if active then path // "lib_protocol/test/helpers"
           else path // "lib_protocol")
-        ~opam:
-          (if active then sf "tezos-%s-test-helpers" name_dash
-          else sf "tezos-%s-test-helpers" name_dash)
+        ~opam:name
         ~internal_name:(sf "tezos_%s_test_helpers" name_underscore)
         ~synopsis:"Tezos/Protocol: protocol testing framework"
         ~opam_only_deps:[octez_protocol_environment; parameters |> if_some]
-- 
GitLab


From a2f9c81fff956bf3301288cade055bb20fbfb6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= <code@bnwr.net>
Date: Fri, 9 Jun 2023 10:02:22 +0200
Subject: [PATCH 2/2] CI: expand list of files which trigger an opam check

---
 .gitlab/ci/jobs/packaging/opam_package.yml | 35 +++++++++++++---------
 manifest/manifest.ml                       |  5 ++--
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml
index d597c7a467dc..0064c39e5eac 100644
--- a/.gitlab/ci/jobs/packaging/opam_package.yml
+++ b/.gitlab/ci/jobs/packaging/opam_package.yml
@@ -20,9 +20,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -48,9 +49,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -76,9 +78,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -104,9 +107,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -132,9 +136,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -160,9 +165,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
@@ -188,9 +194,10 @@
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
diff --git a/manifest/manifest.ml b/manifest/manifest.ml
index 49a8ca9d10ef..de200597f439 100644
--- a/manifest/manifest.ml
+++ b/manifest/manifest.ml
@@ -3329,9 +3329,10 @@ let generate_opam_ci opam_release_graph =
         - "**/dune-project"
         - "**/dune-workspace"
         - "**/*.opam"
-        - .gitlab/ci/opam-ci.yml
-        - .gitlab/ci/packaging.yml
+        - .gitlab/ci/jobs/packaging/opam_prepare.yml
+        - .gitlab/ci/jobs/packaging/opam_package.yml
         - manifest/manifest.ml
+        - manifest/main.ml
         - scripts/opam-prepare-repo.sh
         - scripts/version.sh
       when: delayed
-- 
GitLab