From 03565a440cd2746cb7e2ac81f2aed4d6b4f93092 Mon Sep 17 00:00:00 2001
From: Gabriel Moise <gabriel.moise@trili.tech>
Date: Wed, 27 Aug 2025 16:57:01 +0100
Subject: [PATCH 1/2] Baker: Fix directory creation

---
 src/lib_agnostic_baker/commands.ml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib_agnostic_baker/commands.ml b/src/lib_agnostic_baker/commands.ml
index 9d283af42f0c..08096dbf989b 100644
--- a/src/lib_agnostic_baker/commands.ml
+++ b/src/lib_agnostic_baker/commands.ml
@@ -267,7 +267,11 @@ module Baker = struct
         ~verbose_rpc_error_diagnostics:false
     in
     let* parsed, _remaining =
-      C.parse_config_args full (Array.to_list Sys.argv)
+      C.parse_config_args
+        full
+        (match Array.to_list Sys.argv with
+        | _ :: original_args -> original_args
+        | [] -> [])
     in
     let parsed_config_file = parsed.Client_config.parsed_config_file in
     let parsed_args = parsed.Client_config.parsed_args in
-- 
GitLab


From 5d8d19fb059837175c18b69f74f9c24fd329ef6a Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Tue, 2 Sep 2025 12:59:01 +0200
Subject: [PATCH 2/2] CI: [ocaml_fmt] uses [build] image

---
 .gitlab/ci/pipelines/before_merging.yml         | 8 +++++---
 .gitlab/ci/pipelines/merge_train.yml            | 8 +++++---
 .gitlab/ci/pipelines/schedule_extended_test.yml | 8 +++++---
 ci/bin/code_verification.ml                     | 2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml
index 5f2f90797963..8b86e28b5eb7 100644
--- a/.gitlab/ci/pipelines/before_merging.yml
+++ b/.gitlab/ci/pipelines/before_merging.yml
@@ -195,7 +195,7 @@ docker:hadolint:
   - hadolint Dockerfile
 
 oc.ocaml_fmt:
-  image: ${ci_image_name_protected}/build:amd64--master
+  image: ${ci_image_name}/build:${ci_image_tag}
   stage: sanity
   tags:
   - gcp
@@ -207,8 +207,10 @@ oc.ocaml_fmt:
     - .gitlab-ci.yml
     - .gitlab/**/*
     when: on_success
-  needs: []
-  dependencies: []
+  needs:
+  - oc.docker:ci:amd64
+  dependencies:
+  - oc.docker:ci:amd64
   timeout: 60 minutes
   cache:
     key: dune_cache-$CI_JOB_NAME_SLUG
diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml
index c23eac2a4c3d..73e0cccba101 100644
--- a/.gitlab/ci/pipelines/merge_train.yml
+++ b/.gitlab/ci/pipelines/merge_train.yml
@@ -195,7 +195,7 @@ docker:hadolint:
   - hadolint Dockerfile
 
 oc.ocaml_fmt:
-  image: ${ci_image_name_protected}/build:amd64--master
+  image: ${ci_image_name}/build:${ci_image_tag}
   stage: sanity
   tags:
   - gcp
@@ -207,8 +207,10 @@ oc.ocaml_fmt:
     - .gitlab-ci.yml
     - .gitlab/**/*
     when: on_success
-  needs: []
-  dependencies: []
+  needs:
+  - oc.docker:ci:amd64
+  dependencies:
+  - oc.docker:ci:amd64
   timeout: 60 minutes
   cache:
     key: dune_cache-$CI_JOB_NAME_SLUG
diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml
index d49da8719c53..148808655ce1 100644
--- a/.gitlab/ci/pipelines/schedule_extended_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_test.yml
@@ -188,14 +188,16 @@ docker:hadolint:
   - hadolint Dockerfile
 
 oc.ocaml_fmt:
-  image: ${ci_image_name_protected}/build:amd64--master
+  image: ${ci_image_name}/build:${ci_image_tag}
   stage: sanity
   tags:
   - gcp
   rules:
   - when: always
-  needs: []
-  dependencies: []
+  needs:
+  - oc.docker:ci:amd64
+  dependencies:
+  - oc.docker:ci:amd64
   timeout: 60 minutes
   cache:
     key: dune_cache-$CI_JOB_NAME_SLUG
diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml
index 075d0ebd9552..8445bb416e21 100644
--- a/ci/bin/code_verification.ml
+++ b/ci/bin/code_verification.ml
@@ -423,7 +423,7 @@ let jobs pipeline_type =
       job
         ~__POS__
         ~name:"oc.ocaml_fmt"
-        ~image:Images.CI.build_master
+        ~image:Images.CI.build
         ~stage
         ~dependencies
         ~rules:(make_rules ~changes:changeset_ocaml_fmt_files ())
-- 
GitLab