From 9909f5c430b991ca476368715d9b43278432faf4 Mon Sep 17 00:00:00 2001
From: light7734 <light7734@tuta.io>
Date: Sun, 20 Jul 2025 07:58:41 +0330
Subject: [PATCH] ci: refactors

---
 .drone.yml                                    | 25 ++++++-------------
 .../clang/lsan.sh}                            |  2 ++
 .../gcc/unit-tests.sh}                        |  2 ++
 .../gcc/valgrind.sh}                          |  3 +++
 .../{ => amd64/msvc}/amd64_msvc_tests.ps1     |  0
 tools/ci/steps/static_analysis.sh             |  2 ++
 tools/ci/steps/style.sh                       |  1 +
 tools/scripts/build_ci_images.sh              |  4 +++
 8 files changed, 22 insertions(+), 17 deletions(-)
 rename tools/ci/steps/{amd64_clang_sanitizer_leak.sh => amd64/clang/lsan.sh} (94%)
 rename tools/ci/steps/{amd64_gcc_tests.sh => amd64/gcc/unit-tests.sh} (86%)
 rename tools/ci/steps/{amd64_gcc_valgrind.sh => amd64/gcc/valgrind.sh} (88%)
 rename tools/ci/steps/{ => amd64/msvc}/amd64_msvc_tests.ps1 (100%)

diff --git a/.drone.yml b/.drone.yml
index 94ab086..aee059d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: exec
-name: amd64_msvc — tests
+name: amd64 — msvc
 trigger:
   branch:
   - main
@@ -10,7 +10,7 @@ platform:
   arch: amd64
 
 steps:
-- name: tests
+- name: unit tests
   shell: powershell
   commands: 
     - ./tools/ci/steps/amd64_msvc_tests.ps1
@@ -18,37 +18,28 @@ steps:
 ---
 kind: pipeline
 type: docker
-name: amd64_gcc — tests
+name: amd64 — gcc
 trigger:
   branch:
   - main
 
 steps:
-- name: tests
+- name: unit tests
   image: unit_tests:latest
   pull: if-not-exists
   commands:
-    - ./tools/ci/steps/amd64_gcc_tests.sh
+    - ./tools/ci/steps/amd64/gcc/unit-tests.sh
 
----
-kind: pipeline
-type: docker
-name: amd64_gcc — valgrind
-trigger:
-  branch:
-  - main
-
-steps:
 - name: valgrind
   image: valgrind:latest
   pull: if-not-exists
   commands:
-    - ./tools/ci/steps/amd64_gcc_valgrind.sh
+    - ./tools/ci/steps/amd64/gcc/valgrind.sh
 
 ---
 kind: pipeline
 type: docker
-name: amd64_clang — sanitizer — leak
+name: amd64 — clang
 trigger:
   branch:
   - main
@@ -58,7 +49,7 @@ steps:
   image: leak_sanitizer:latest
   pull: if-not-exists
   commands:
-    - ./tools/ci/steps/amd64_clang_sanitizer_leak.sh
+    - ./tools/ci/steps/amd64/clang/lsan.sh
 
 ---
 kind: pipeline
diff --git a/tools/ci/steps/amd64_clang_sanitizer_leak.sh b/tools/ci/steps/amd64/clang/lsan.sh
similarity index 94%
rename from tools/ci/steps/amd64_clang_sanitizer_leak.sh
rename to tools/ci/steps/amd64/clang/lsan.sh
index 4a6871f..636f384 100755
--- a/tools/ci/steps/amd64_clang_sanitizer_leak.sh
+++ b/tools/ci/steps/amd64/clang/lsan.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 set -e
+cd $(git rev-parse --show-toplevel)/
+rm -rf ./build
 
 conan build . \
   -c tools.system.package_manager:mode=install \
diff --git a/tools/ci/steps/amd64_gcc_tests.sh b/tools/ci/steps/amd64/gcc/unit-tests.sh
similarity index 86%
rename from tools/ci/steps/amd64_gcc_tests.sh
rename to tools/ci/steps/amd64/gcc/unit-tests.sh
index 208ee8d..a23b555 100755
--- a/tools/ci/steps/amd64_gcc_tests.sh
+++ b/tools/ci/steps/amd64/gcc/unit-tests.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 set -e
+cd $(git rev-parse --show-toplevel)/
+rm -rf ./build
 
 conan build . \
   -c tools.system.package_manager:mode=install \
diff --git a/tools/ci/steps/amd64_gcc_valgrind.sh b/tools/ci/steps/amd64/gcc/valgrind.sh
similarity index 88%
rename from tools/ci/steps/amd64_gcc_valgrind.sh
rename to tools/ci/steps/amd64/gcc/valgrind.sh
index cba4ed7..453f8aa 100755
--- a/tools/ci/steps/amd64_gcc_valgrind.sh
+++ b/tools/ci/steps/amd64/gcc/valgrind.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 set -e
+cd $(git rev-parse --show-toplevel)/
+rm -rf ./build
+
 conan build . \
   -c tools.system.package_manager:mode=install \
   -c tools.cmake.cmaketoolchain:generator=Ninja \
diff --git a/tools/ci/steps/amd64_msvc_tests.ps1 b/tools/ci/steps/amd64/msvc/amd64_msvc_tests.ps1
similarity index 100%
rename from tools/ci/steps/amd64_msvc_tests.ps1
rename to tools/ci/steps/amd64/msvc/amd64_msvc_tests.ps1
diff --git a/tools/ci/steps/static_analysis.sh b/tools/ci/steps/static_analysis.sh
index c44974a..6bccd54 100755
--- a/tools/ci/steps/static_analysis.sh
+++ b/tools/ci/steps/static_analysis.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 set -e
+cd $(git rev-parse --show-toplevel)/
+rm -rf ./build
 
 conan build . \
 -c tools.system.package_manager:mode=install \
diff --git a/tools/ci/steps/style.sh b/tools/ci/steps/style.sh
index 6c1aa46..f96e4f1 100755
--- a/tools/ci/steps/style.sh
+++ b/tools/ci/steps/style.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+cd $(git rev-parse --show-toplevel)/
 
 has_fomatting_issues=0
 for file in $(find ./modules -name '*.?pp'); do
diff --git a/tools/scripts/build_ci_images.sh b/tools/scripts/build_ci_images.sh
index dc72c4a..12574a6 100755
--- a/tools/scripts/build_ci_images.sh
+++ b/tools/scripts/build_ci_images.sh
@@ -20,4 +20,8 @@ echo "==> Building image: valgrind"
 cd "$IMAGE_DIR/valgrind"
 docker build -t valgrind .
 
+echo "==> Building image: leak_sanitizer"
+cd "$IMAGE_DIR/leak_sanitizer"
+docker build -t leak_sanitizer .
+
 echo "WOOOOOOOOOOOOOOOOH!!! DONE :D"