From 022bb68c9d21445e3162edf234600a96506bc35e Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Tue, 18 Feb 2025 14:49:13 +0100
Subject: [PATCH 1/2] Makefile: use [teztale-experimental-executables] in its
 build rule

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3e2789c851b5..a5caa49bbc8c 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,8 @@ OCTEZ_ONLY_EXECUTABLES := $(filter-out etherlink-governance-observer octez-evm-n
 #Define octez layer1 only executables by excluding the EVM-node and teztale tools.
 OCTEZ_ONLY_LAYER1_EXECUTABLES := $(filter-out etherlink-governance-observer octez-evm-node octez-teztale-archiver octez-teztale-server octez-teztale-snitch octez-smart-rollup-wasm-debugger octez-smart-rollup-node octez-dal-node,$(RELEASED_EXECUTABLES) $(EXPERIMENTAL_EXECUTABLES))
 
+TEZTALE_EXECUTABLES := $(shell cat script-inputs/experimental-executables)
+
 # Set of Dune targets to build, in addition to OCTEZ_EXECUTABLES, in
 # the `build` target's Dune invocation. This is used in the CI to
 # build the TPS evaluation tool, Octogram and the Tezt test suite in the
@@ -108,7 +110,7 @@ octez-layer1:
 
 .PHONY: teztale
 teztale:
-	@$(MAKE) build OCTEZ_EXECUTABLES?="octez-teztale-archiver octez-teztale-server octez-teztale-snitch"
+	@$(MAKE) build OCTEZ_EXECUTABLES?="${TEZTALE_EXECUTABLES}"
 
 .PHONY: experimental-release
 experimental-release:
-- 
GitLab


From e995ed2b5f31284072e28bc5b5f938df900a27a0 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Tue, 18 Feb 2025 14:54:33 +0100
Subject: [PATCH 2/2] Makefile: Use [octez-*-executables] in octez build rule

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a5caa49bbc8c..521188380cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,10 @@ DEV_EXECUTABLES := $(shell cat script-inputs/dev-executables)
 
 ALL_EXECUTABLES := $(RELEASED_EXECUTABLES) $(EXPERIMENTAL_EXECUTABLES) $(DEV_EXECUTABLES)
 
-#Define octez only executables by excluding the EVM-node and teztale tools.
-OCTEZ_ONLY_EXECUTABLES := $(filter-out etherlink-governance-observer octez-evm-node octez-teztale-archiver octez-teztale-server octez-teztale-snitch,${ALL_EXECUTABLES})
+#Define octez only executables.
+OCTEZ_ONLY_RELEASED_EXECUTABLES := $(shell cat script-inputs/octez-released-executables)
+OCTEZ_ONLY_EXPERIMENTAL_EXECUTABLES := $(shell cat script-inputs/octez-experimental-executables)
+OCTEZ_ONLY_EXECUTABLES := $(OCTEZ_ONLY_RELEASED_EXECUTABLES) $(OCTEZ_ONLY_EXPERIMENTAL_EXECUTABLES)
 
 #Define octez layer1 only executables by excluding the EVM-node and teztale tools.
 OCTEZ_ONLY_LAYER1_EXECUTABLES := $(filter-out etherlink-governance-observer octez-evm-node octez-teztale-archiver octez-teztale-server octez-teztale-snitch octez-smart-rollup-wasm-debugger octez-smart-rollup-node octez-dal-node,$(RELEASED_EXECUTABLES) $(EXPERIMENTAL_EXECUTABLES))
-- 
GitLab