From 0f022592b42ec98a60e945a9309eb77c5d0de356 Mon Sep 17 00:00:00 2001
From: Aster Seker <git.electroyar@gmail.com>
Date: Thu, 4 Dec 2025 06:24:15 +0300
Subject: [PATCH] ci: integrate odr checks into main workflow

Move the ODR verification steps into the primary CI workflow and remove the standalone odr_check configuration.
---
 .github/workflows/ci.yml        | 37 +++++++++++++++++++++++++++++
 .github/workflows/odr_check.yml | 41 ---------------------------------
 2 files changed, 37 insertions(+), 41 deletions(-)
 delete mode 100644 .github/workflows/odr_check.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a512f11..c6a2c13 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -147,6 +147,43 @@ jobs:
       - name: Test
         run: ctest --test-dir build --output-on-failure
 
+  odr:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: tests/odr
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - run: git submodule update --init --recursive
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential
+
+      - name: Build Logit ODR header
+        run: |
+          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_logger_a.cpp
+          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_logger_b.cpp
+          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_logger_main.cpp
+          g++ get_logger_a.o get_logger_b.o get_logger_main.o -o app_logger
+
+      - name: Run ConsoleApp ODR header
+        run: ./app_logger
+
+      - name: Build Task Executor ODR header
+        run: |
+          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_executor_a.cpp
+          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_executor_b.cpp
+          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_executor_main.cpp
+          g++ get_executor_a.o get_executor_b.o get_executor_main.o -o app_executor
+
+      - name: Run Task Executor ODR header
+        run: ./app_executor
+
   bench-asan:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/odr_check.yml b/.github/workflows/odr_check.yml
deleted file mode 100644
index 41bf517..0000000
--- a/.github/workflows/odr_check.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: ODR checks
-
-on:
-  push
-
-jobs:
-  odr:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: tests/odr
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential
-          
-      - name: Build Logit ODR header
-        run: |
-          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_logger_a.cpp
-          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_logger_b.cpp
-          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_logger_main.cpp
-          g++ get_logger_a.o get_logger_b.o get_logger_main.o -o app_logger
-          
-      - name: Run ConsoleApp ODR header
-        run: ./app_logger
-        
-      - name: Build Task Executor ODR header
-        run: |
-          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_executor_a.cpp
-          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_executor_b.cpp
-          g++ -std=c++17 -I ../../include -I ../../libs/time-shield-cpp/include -c get_executor_main.cpp
-          g++ get_executor_a.o get_executor_b.o get_executor_main.o -o app_executor
-          
-      - name: Run Task Executor ODR header
-        run: ./app_executor
-        
\ No newline at end of file