From b4fb3c0a182d6df84e29f833d5691f1ed8fab1ff Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Sat, 14 Mar 2026 11:39:52 -0300
Subject: [PATCH 01/12] #1402: Support ARM for test-cuda flavor

---
 flavors/test-Exasol-8-cuda-ml/ci.json                        | 2 +-
 .../test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/flavors/test-Exasol-8-cuda-ml/ci.json b/flavors/test-Exasol-8-cuda-ml/ci.json
index 2366dab5..ba75da97 100644
--- a/flavors/test-Exasol-8-cuda-ml/ci.json
+++ b/flavors/test-Exasol-8-cuda-ml/ci.json
@@ -1,5 +1,5 @@
 {
-  "build_runners": ["int-linux-x64-4core-ubuntu24.04-1"],
+  "build_runners": ["int-linux-x64-4core-ubuntu24.04-1", "int-linux-arm-4core-ubuntu24.04-1"],
   "test_config": {
     "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1"],
     "test_sets": [
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
index bf7cc313..2c8a55c4 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
@@ -5,8 +5,9 @@ RUN mkdir -p /build_info/packages
 COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml
 RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps
 
-RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
+RUN curl -fsSL -o swig-2.0.4.tar.gz \
+        https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
     tar zxf swig-2.0.4.tar.gz && \
-    (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \
+    (cd swig-2.0.4 && ./configure --build=$(arch)-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
     rm -rf swig-2.0.4 swig-2.0.4.tar.gz
 

From 18ceac3eed7eb9984ba677c1ded5824992d2bb4e Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Mon, 16 Mar 2026 14:09:18 +0000
Subject: [PATCH 02/12] 1. Replaced Gxx/Gcc package with "compilers" package 2.
 Introduces new variable to configure Swig

---
 .../flavor_base/build_deps/Dockerfile                     | 4 +++-
 flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml    | 8 ++++----
 flavors/test-Exasol-8-cuda-ml/packages.yml                | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
index 2c8a55c4..b963b742 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
@@ -5,9 +5,11 @@ RUN mkdir -p /build_info/packages
 COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml
 RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps
 
+RUN exaslpm export-variables --out-file /env
+
 RUN curl -fsSL -o swig-2.0.4.tar.gz \
         https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
     tar zxf swig-2.0.4.tar.gz && \
-    (cd swig-2.0.4 && ./configure --build=$(arch)-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
+    (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$SWIG_HOST-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
     rm -rf swig-2.0.4 swig-2.0.4.tar.gz
 
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
index 7387348c..3516f01a 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
@@ -16,16 +16,16 @@ build_steps:
         version: =4.4.1
       - name: chrpath
         version: '=0.16'
-      - name: gxx_linux-64
-        version: =13.4.0
-      - name: gcc_linux-64
-        version: =13.4.0
+      - name: compilers
+        version: =1.11.0
       binary: Mamba
     variables:
       PROTOBUF_BIN: '$MAMBA_ROOT_PREFIX/bin/protoc'
       LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/'
       CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
+      SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
+      SWIG_HOST: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps
diff --git a/flavors/test-Exasol-8-cuda-ml/packages.yml b/flavors/test-Exasol-8-cuda-ml/packages.yml
index b54c7c4c..4cf7b08d 100644
--- a/flavors/test-Exasol-8-cuda-ml/packages.yml
+++ b/flavors/test-Exasol-8-cuda-ml/packages.yml
@@ -70,7 +70,7 @@ build_steps:
       - name: pyarrow
         version: =22.0.0
       - name: libarrow
-        version: =22.0.0=h552f9d5_3_cuda
+        version: =22.0.0=*_cuda
       - name: mamba
         version: =2.3.3
       binary: Micromamba
@@ -109,7 +109,7 @@ build_steps:
       - name: numba-cuda
         version: =0.20.0
       - name: pytorch
-        version: =2.8.0=cuda129_generic_py312_h464b887_201
+        version: =2.8.0=cuda129_generic_py312_*
       binary: Mamba
   validation_cfg:
     version_mandatory: true

From 9abe4fed7b694d4be87cc696b3e6fa69f10d7f55 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Mon, 16 Mar 2026 14:35:39 -0300
Subject: [PATCH 03/12] Set AR as env variable

---
 exaudfclient/.bazelrc                                      | 2 +-
 .../flavor_base/build_deps/Dockerfile                      | 1 +
 flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml     | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/exaudfclient/.bazelrc b/exaudfclient/.bazelrc
index 5ca3b697..7c5ba15f 100644
--- a/exaudfclient/.bazelrc
+++ b/exaudfclient/.bazelrc
@@ -26,4 +26,4 @@ build:valgrind -c dbg
 build:valgrind --copt -g
 build:valgrind --strip=never
 build:valgrind --copt -DVALGRIND_ACTIVE
-build:fix_conda_ar_tool --action_env=AR=x86_64-conda-linux-gnu-gcc-ar --features=-archive_param_file
\ No newline at end of file
+build:fix_conda_ar_tool --features=-archive_param_file
\ No newline at end of file
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
index b963b742..e610c0b5 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
@@ -13,3 +13,4 @@ RUN curl -fsSL -o swig-2.0.4.tar.gz \
     (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$SWIG_HOST-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
     rm -rf swig-2.0.4 swig-2.0.4.tar.gz
 
+
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
index 3516f01a..f5b5c968 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
@@ -16,8 +16,10 @@ build_steps:
         version: =4.4.1
       - name: chrpath
         version: '=0.16'
-      - name: compilers
-        version: =1.11.0
+      - name: gxx
+        version: =13.4.0
+      - name: gcc
+        version: =13.4.0
       binary: Mamba
     variables:
       PROTOBUF_BIN: '$MAMBA_ROOT_PREFIX/bin/protoc'
@@ -26,6 +28,7 @@ build_steps:
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
       SWIG_HOST: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
+      AR: "/opt/conda/bin/{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps

From 9a739f97e8ae10e9b28746f0cb48efeec75c10b5 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Mon, 16 Mar 2026 16:43:50 -0300
Subject: [PATCH 04/12] New AR Bazel config

---
 exaudfclient/.bazelrc                                          | 3 ++-
 .../flavor_base/build_run/Dockerfile                           | 2 +-
 .../flavor_base/build_run/Dockerfile                           | 2 +-
 .../flavor_base/build_run/Dockerfile                           | 2 +-
 .../flavor_base/build_run/Dockerfile                           | 2 +-
 .../test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile    | 2 +-
 flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile | 2 +-
 flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml         | 3 +--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/exaudfclient/.bazelrc b/exaudfclient/.bazelrc
index 7c5ba15f..b9ee1b4d 100644
--- a/exaudfclient/.bazelrc
+++ b/exaudfclient/.bazelrc
@@ -26,4 +26,5 @@ build:valgrind -c dbg
 build:valgrind --copt -g
 build:valgrind --strip=never
 build:valgrind --copt -DVALGRIND_ACTIVE
-build:fix_conda_ar_tool --features=-archive_param_file
\ No newline at end of file
+build:fix_conda_ar_tool_amd64 --action_env=AR=x86_64-conda-linux-gnu-gcc-ar --features=-archive_param_file
+build:fix_conda_ar_tool_arm64 --action_env=AR=aarch64-conda-linux-gnu-gcc-ar --features=-archive_param_file
\ No newline at end of file
diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
index 3ab04c75..7c309d2f 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool"
+RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_amd64"
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
index 35dc10c1..7a91a579 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool"
+RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_amd64"
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
index fa3a6786..1ce93a68 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ COPY exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool"
+RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool_amd64"
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
index 92166c29..0f36635e 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool"
+RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool_amd64"
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
index e610c0b5..679b1ada 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_deps/Dockerfile
@@ -10,7 +10,7 @@ RUN exaslpm export-variables --out-file /env
 RUN curl -fsSL -o swig-2.0.4.tar.gz \
         https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
     tar zxf swig-2.0.4.tar.gz && \
-    (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$SWIG_HOST-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
+    (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
     rm -rf swig-2.0.4 swig-2.0.4.tar.gz
 
 
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
index 3ab04c75..6cb67f0b 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool"
+RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_$HOST_PLATFORM"
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
index f5b5c968..9379b5a0 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
@@ -27,8 +27,7 @@ build_steps:
       CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
-      SWIG_HOST: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
-      AR: "/opt/conda/bin/{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar"
+      HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps

From 91e0e04d16d3580557c14968a8f83293e8cf43d2 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Tue, 17 Mar 2026 11:02:10 +0000
Subject: [PATCH 05/12] Fixed build run

---
 flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
index 6cb67f0b..cdc4fb78 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_$HOST_PLATFORM"
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_$HOST_PLATFORM
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base

From 4a98741601f2c4e2fd113357f618e0bca53c7e76 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Tue, 17 Mar 2026 08:21:04 -0300
Subject: [PATCH 06/12] Fixed all other Conda based flavors

---
 flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json  | 2 +-
 .../flavor_base/build_deps/Dockerfile                     | 7 +++++--
 .../flavor_base/build_run/Dockerfile                      | 2 +-
 .../flavor_base/packages.yml                              | 6 ++++--
 flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json  | 2 +-
 .../flavor_base/build_deps/Dockerfile                     | 7 +++++--
 .../flavor_base/build_run/Dockerfile                      | 2 +-
 .../flavor_base/packages.yml                              | 6 ++++--
 flavors/template-Exasol-all-python-3.10-conda/ci.json     | 2 +-
 .../flavor_base/build_deps/Dockerfile                     | 7 +++++--
 .../flavor_base/build_run/Dockerfile                      | 2 +-
 .../flavor_base/packages.yml                              | 6 ++++--
 flavors/template-Exasol-all-python-3.12-conda/ci.json     | 2 +-
 .../flavor_base/build_deps/Dockerfile                     | 7 +++++--
 .../flavor_base/build_run/Dockerfile                      | 2 +-
 .../flavor_base/packages.yml                              | 8 +++++---
 16 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json b/flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json
index 6417437e..91ab757f 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/ci.json
@@ -1,5 +1,5 @@
 {
-  "build_runners": ["int-linux-x64-4core-ubuntu24.04-1"],
+  "build_runners": ["int-linux-x64-4core-ubuntu24.04-1", "int-linux-arm-4core-ubuntu24.04-1"],
   "test_config": {
     "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1"],
     "test_sets": [
diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile
index cc2e0782..d43e117d 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile
@@ -5,7 +5,10 @@ RUN mkdir -p /build_info/packages
 COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml
 RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps
 
-RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
+RUN exaslpm export-variables --out-file /env
+
+RUN curl -fsSL -o swig-2.0.4.tar.gz \
+        https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
     tar zxf swig-2.0.4.tar.gz && \
-    (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \
+    (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
     rm -rf swig-2.0.4 swig-2.0.4.tar.gz
diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
index 7c309d2f..cdc4fb78 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_amd64"
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_$HOST_PLATFORM
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml
index bb8f9b55..e4394132 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml
@@ -16,9 +16,9 @@ build_steps:
         version: '=4.3'
       - name: chrpath
         version: '=0.16'
-      - name: gxx_linux-64
+      - name: gxx
         version: =13.4.0
-      - name: gcc_linux-64
+      - name: gcc
         version: =13.4.0
       binary: Mamba
     variables:
@@ -26,6 +26,8 @@ build_steps:
       LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/'
       CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
+      SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
+      HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json b/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json
index 6417437e..a2d239a1 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json
@@ -1,7 +1,7 @@
 {
   "build_runners": ["int-linux-x64-4core-ubuntu24.04-1"],
   "test_config": {
-    "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1"],
+    "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1", "int-linux-arm-2core-ubuntu24.04-1"],
     "test_sets": [
       {
         "name": "python",
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_deps/Dockerfile
index cc2e0782..d43e117d 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_deps/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_deps/Dockerfile
@@ -5,7 +5,10 @@ RUN mkdir -p /build_info/packages
 COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml
 RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps
 
-RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
+RUN exaslpm export-variables --out-file /env
+
+RUN curl -fsSL -o swig-2.0.4.tar.gz \
+        https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
     tar zxf swig-2.0.4.tar.gz && \
-    (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \
+    (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
     rm -rf swig-2.0.4 swig-2.0.4.tar.gz
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
index 7a91a579..6a85451d 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_amd64"
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_$HOST_PLATFORM
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml
index 7387348c..9379b5a0 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml
@@ -16,9 +16,9 @@ build_steps:
         version: =4.4.1
       - name: chrpath
         version: '=0.16'
-      - name: gxx_linux-64
+      - name: gxx
         version: =13.4.0
-      - name: gcc_linux-64
+      - name: gcc
         version: =13.4.0
       binary: Mamba
     variables:
@@ -26,6 +26,8 @@ build_steps:
       LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/'
       CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
+      SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
+      HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps
diff --git a/flavors/template-Exasol-all-python-3.10-conda/ci.json b/flavors/template-Exasol-all-python-3.10-conda/ci.json
index bce1c17a..6ba1fbbc 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/ci.json
+++ b/flavors/template-Exasol-all-python-3.10-conda/ci.json
@@ -1,7 +1,7 @@
 {
   "build_runners": ["ubuntu-22.04"],
   "test_config": {
-    "default_test_runners": ["ubuntu-22.04"],
+    "default_test_runners": ["ubuntu-22.04", "ubuntu-22.04-arm"],
     "test_sets": [
       {
         "name": "python",
diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile
index cc2e0782..d43e117d 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile
@@ -5,7 +5,10 @@ RUN mkdir -p /build_info/packages
 COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml
 RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps
 
-RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
+RUN exaslpm export-variables --out-file /env
+
+RUN curl -fsSL -o swig-2.0.4.tar.gz \
+        https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
     tar zxf swig-2.0.4.tar.gz && \
-    (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \
+    (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
     rm -rf swig-2.0.4 swig-2.0.4.tar.gz
diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
index 1ce93a68..a94e4564 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ COPY exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool_amd64"
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool_$HOST_PLATFORM
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml
index c396c903..74165bbd 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml
@@ -12,9 +12,9 @@ build_steps:
         version: '=8.45'
       - name: bazel
         version: =8.3.1
-      - name: gxx_linux-64
+      - name: gxx
         version: =12.4.0
-      - name: gcc_linux-64
+      - name: gcc
         version: =12.4.0
       - name: make
         version: '=4.3'
@@ -26,6 +26,8 @@ build_steps:
       LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/'
       CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
+      SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
+      HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps
diff --git a/flavors/template-Exasol-all-python-3.12-conda/ci.json b/flavors/template-Exasol-all-python-3.12-conda/ci.json
index 1d17fd67..04a7d5eb 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/ci.json
+++ b/flavors/template-Exasol-all-python-3.12-conda/ci.json
@@ -1,7 +1,7 @@
 {
   "build_runners": ["ubuntu-24.04"],
   "test_config": {
-    "default_test_runners": ["ubuntu-24.04"],
+    "default_test_runners": ["ubuntu-24.04", "ubuntu-24.04-arm"],
     "test_sets": [
       {
         "name": "python",
diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_deps/Dockerfile
index cc2e0782..d43e117d 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_deps/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_deps/Dockerfile
@@ -5,7 +5,10 @@ RUN mkdir -p /build_info/packages
 COPY build_deps_packages.yml /build_info/packages/build_deps_packages.yml
 RUN exaslpm install --package-file /build_info/packages/build_deps_packages.yml --build-step build_deps
 
-RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
+RUN exaslpm export-variables --out-file /env
+
+RUN curl -fsSL -o swig-2.0.4.tar.gz \
+        https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \
     tar zxf swig-2.0.4.tar.gz && \
-    (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \
+    (cd swig-2.0.4 && source /env && ./configure --build=$SWIG_BUILD_ARCH-unknown-linux-gnu --host=$HOST_PLATFORM-unknown-linux-gnu --prefix=/usr && make -j"$(nproc)" && make install) && \
     rm -rf swig-2.0.4 swig-2.0.4.tar.gz
diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
index 0f36635e..4c50be0b 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN bash -c "source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool_amd64"
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool_$HOST_PLATFORM
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml
index 35ba25be..c1f4adf5 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml
@@ -16,16 +16,18 @@ build_steps:
             version: =4.4.1
           - name: chrpath
             version: '=0.16'
-          - name: gxx_linux-64
+          - name: gxx
             version: =15.1.0
-          - name: gcc_linux-64
+          - name: gcc
             version: =15.1.0
-        binary: Mamba
+            binary: Mamba
       variables:
         PROTOBUF_BIN: '$MAMBA_ROOT_PREFIX/bin/protoc'
         LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:$MAMBA_ROOT_PREFIX/lib/'
         CPLUS_INCLUDE_PATH: '$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
         C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
+        SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
+        HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps

From 7b8b5d6e5dbf2de50f461eb7074d8a9bfea4307f Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Tue, 17 Mar 2026 15:01:20 +0000
Subject: [PATCH 07/12] Fixed cuda packages

---
 flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml | 2 +-
 flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml b/flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml
index d145e3d0..8920176e 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/packages.yml
@@ -70,7 +70,7 @@ build_steps:
       - name: cuda-toolkit
         version: =12.9.1
       - name: libarrow
-        version: =22.0.0=h552f9d5_3_cuda
+        version: =22.0.0=*_cuda
       - name: mamba
         version: =2.3.3
       binary: Micromamba
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml b/flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml
index d6d39b9f..0ca9eafe 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/packages.yml
@@ -70,7 +70,7 @@ build_steps:
       - name: pyarrow
         version: =22.0.0
       - name: libarrow
-        version: =22.0.0=h552f9d5_3_cuda
+        version: =22.0.0=*_cuda
       - name: mamba
         version: =2.3.3
       - name: cuda-toolkit

From ebdffb95435dcf4776b81da152a71f698369e7b9 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Tue, 17 Mar 2026 12:35:53 -0300
Subject: [PATCH 08/12] Fixed CI.json files (ARM runner for builds instead of
 tests)

---
 flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json | 4 ++--
 flavors/template-Exasol-all-python-3.10-conda/ci.json    | 4 ++--
 flavors/template-Exasol-all-python-3.12-conda/ci.json    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json b/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json
index a2d239a1..91ab757f 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/ci.json
@@ -1,7 +1,7 @@
 {
-  "build_runners": ["int-linux-x64-4core-ubuntu24.04-1"],
+  "build_runners": ["int-linux-x64-4core-ubuntu24.04-1", "int-linux-arm-4core-ubuntu24.04-1"],
   "test_config": {
-    "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1", "int-linux-arm-2core-ubuntu24.04-1"],
+    "default_test_runners": ["int-linux-x64-2core-ubuntu24.04-1"],
     "test_sets": [
       {
         "name": "python",
diff --git a/flavors/template-Exasol-all-python-3.10-conda/ci.json b/flavors/template-Exasol-all-python-3.10-conda/ci.json
index 6ba1fbbc..77390081 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/ci.json
+++ b/flavors/template-Exasol-all-python-3.10-conda/ci.json
@@ -1,7 +1,7 @@
 {
-  "build_runners": ["ubuntu-22.04"],
+  "build_runners": ["ubuntu-22.04", "ubuntu-22.04-arm"],
   "test_config": {
-    "default_test_runners": ["ubuntu-22.04", "ubuntu-22.04-arm"],
+    "default_test_runners": ["ubuntu-22.04"],
     "test_sets": [
       {
         "name": "python",
diff --git a/flavors/template-Exasol-all-python-3.12-conda/ci.json b/flavors/template-Exasol-all-python-3.12-conda/ci.json
index 04a7d5eb..634fc08c 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/ci.json
+++ b/flavors/template-Exasol-all-python-3.12-conda/ci.json
@@ -1,7 +1,7 @@
 {
-  "build_runners": ["ubuntu-24.04"],
+  "build_runners": ["ubuntu-24.04", "ubuntu-24.04-arm"],
   "test_config": {
-    "default_test_runners": ["ubuntu-24.04", "ubuntu-24.04-arm"],
+    "default_test_runners": ["ubuntu-24.04"],
     "test_sets": [
       {
         "name": "python",

From 53d01af2ab321a81835e222c5ce406a4d03686d4 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Wed, 18 Mar 2026 07:27:06 -0300
Subject: [PATCH 09/12] Using AR environment variable instead of 2 bazel
 configs

---
 exaudfclient/.bazelrc                                          | 3 +--
 .../flavor_base/build_run/Dockerfile                           | 2 +-
 .../flavor_base/packages.yml                                   | 1 +
 .../flavor_base/build_run/Dockerfile                           | 2 +-
 .../flavor_base/packages.yml                                   | 1 +
 .../flavor_base/build_run/Dockerfile                           | 2 +-
 .../flavor_base/packages.yml                                   | 1 +
 .../flavor_base/build_run/Dockerfile                           | 2 +-
 .../flavor_base/packages.yml                                   | 1 +
 flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile | 2 +-
 flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml         | 1 +
 11 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/exaudfclient/.bazelrc b/exaudfclient/.bazelrc
index b9ee1b4d..c18d5cb4 100644
--- a/exaudfclient/.bazelrc
+++ b/exaudfclient/.bazelrc
@@ -26,5 +26,4 @@ build:valgrind -c dbg
 build:valgrind --copt -g
 build:valgrind --strip=never
 build:valgrind --copt -DVALGRIND_ACTIVE
-build:fix_conda_ar_tool_amd64 --action_env=AR=x86_64-conda-linux-gnu-gcc-ar --features=-archive_param_file
-build:fix_conda_ar_tool_arm64 --action_env=AR=aarch64-conda-linux-gnu-gcc-ar --features=-archive_param_file
\ No newline at end of file
+build:fix_conda_ar_tool --features=-archive_param_file
diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
index cdc4fb78..6ae21cef 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_$HOST_PLATFORM
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml
index e4394132..51828791 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/packages.yml
@@ -28,6 +28,7 @@ build_steps:
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
       HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
+      AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
index 6a85451d..ce52b90b 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_$HOST_PLATFORM
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml
index 9379b5a0..c0f48e3c 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/packages.yml
@@ -28,6 +28,7 @@ build_steps:
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
       HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
+      AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps
diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
index a94e4564..2e317037 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ COPY exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
 
-RUN source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool_$HOST_PLATFORM
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml
index 74165bbd..cba1d439 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/packages.yml
@@ -28,6 +28,7 @@ build_steps:
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
       HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
+      AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps
diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
index 4c50be0b..1bd281c6 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/build_run/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool_$HOST_PLATFORM
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config fast-binary --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml
index c1f4adf5..17ce6a1a 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/packages.yml
@@ -28,6 +28,7 @@ build_steps:
         C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
         SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
         HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
+        AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
index cdc4fb78..6ae21cef 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_run/Dockerfile
@@ -7,7 +7,7 @@ RUN exaslpm export-variables --out-file /env
 
 WORKDIR /exaudfclient/
 
-RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool_$HOST_PLATFORM
+RUN source /env && ./build.sh --config no-tty --config optimize --config python --config slow-wrapper --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
index 9379b5a0..c0f48e3c 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/packages.yml
@@ -28,6 +28,7 @@ build_steps:
       C_INCLUDE_PATH: '$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/'
       SWIG_BUILD_ARCH: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}"
       HOST_PLATFORM: "{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}"
+      AR: "{% if platform == 'x86_64' %}x86_64{% else %}aarch64{% endif %}-conda-linux-gnu-gcc-ar"
   validation_cfg:
     version_mandatory: true
 - name: base_test_deps

From f0f8bdf2487f1c13cc39f953bd04970c5e12ba5e Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Fri, 20 Mar 2026 12:30:45 +0000
Subject: [PATCH 10/12] Test


From 6cf3009abe88040e9a3d969c818d1748687b876a Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Fri, 20 Mar 2026 09:52:08 -0300
Subject: [PATCH 11/12] Fixed base_test_build_run build-steps

---
 .../flavor_base/base_test_build_run/Dockerfile                  | 2 +-
 .../flavor_base/base_test_build_run/Dockerfile                  | 2 +-
 .../flavor_base/base_test_build_run/Dockerfile                  | 2 +-
 .../flavor_base/base_test_build_run/Dockerfile                  | 2 +-
 .../flavor_base/base_test_build_run/Dockerfile                  | 2 +-
 .../flavor_base/base_test_build_run/Dockerfile                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile
index f27ba800..5464369f 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile
@@ -10,7 +10,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY /exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries"
+RUN ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/base_test_build_run/Dockerfile
index 571e11ae..26623b7b 100644
--- a/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/base_test_build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.12-cuda-conda/flavor_base/base_test_build_run/Dockerfile
@@ -11,7 +11,7 @@ COPY /exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
 
-RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries"
+RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
 
 RUN cp -r -L bazel-bin/* /exaudf
 
diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile
index b6b9efe9..0680c99a 100644
--- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile
@@ -11,7 +11,7 @@ COPY /exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
 # We need to build with optimize here, because the debug build fails to run with a runtime linking error regarding protobuf
-RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries"
+RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/base_test_build_run/Dockerfile
index f27ba800..555207cf 100644
--- a/flavors/template-Exasol-all-python-3.12-conda/flavor_base/base_test_build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.12-conda/flavor_base/base_test_build_run/Dockerfile
@@ -10,7 +10,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY /exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries"
+RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.12/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12/flavor_base/base_test_build_run/Dockerfile
index 56373824..f02158e8 100644
--- a/flavors/template-Exasol-all-python-3.12/flavor_base/base_test_build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.12/flavor_base/base_test_build_run/Dockerfile
@@ -28,7 +28,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY /exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty -c dbg --config python --config test-binaries"]
+RUN "source /env && bash build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/base_test_build_run/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/base_test_build_run/Dockerfile
index f27ba800..555207cf 100644
--- a/flavors/test-Exasol-8-cuda-ml/flavor_base/base_test_build_run/Dockerfile
+++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/base_test_build_run/Dockerfile
@@ -10,7 +10,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY /exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN bash -c "source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries"
+RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base

From dd479a0b0c1c8f229da5462735ecf011faa99034 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Fri, 20 Mar 2026 10:02:56 -0300
Subject: [PATCH 12/12] Fixed base_test_build_run build-steps

---
 .../flavor_base/base_test_build_run/Dockerfile                  | 2 +-
 .../flavor_base/base_test_build_run/Dockerfile                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile
index 5464369f..555207cf 100644
--- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile
+++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile
@@ -10,7 +10,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY /exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
+RUN source /env && ./build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base
diff --git a/flavors/template-Exasol-all-python-3.12/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12/flavor_base/base_test_build_run/Dockerfile
index f02158e8..56373824 100644
--- a/flavors/template-Exasol-all-python-3.12/flavor_base/base_test_build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.12/flavor_base/base_test_build_run/Dockerfile
@@ -28,7 +28,7 @@ RUN mkdir /exaudfclient /exaudf
 COPY /exaudfclient/ /exaudfclient/
 
 WORKDIR /exaudfclient/
-RUN "source /env && bash build.sh --config no-tty -c dbg --config python --config test-binaries --config fix_conda_ar_tool
+RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty -c dbg --config python --config test-binaries"]
 RUN cp -r -L bazel-bin/* /exaudf
 
 WORKDIR /exaudfclient/base