From b274b0d80c44b0d052892787a20449b0e6a61435 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Wed, 29 Jan 2025 09:04:37 +0100
Subject: [PATCH] move format check into regular build

---
 Jenkinsfile | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 737d0d2..42bc1d8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,6 +35,7 @@ void build_n_test_project() {
 		. .venv/bin/activate
 		pip3 install -r requirements.txt
         cmake -S . -B build --preset Release
+        cmake --build build --target format-check
         cmake --build build -j12
         cmake --build build --target test
     '''
@@ -71,24 +72,6 @@ pipeline {
                         stage('Build & test') { steps { build_n_test_project() }}
                     }
                 }
-                stage('Format check') {
-                    agent {docker {
-                        image 'ubuntu-22.04'
-                        args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-jammy'
-                    } }
-                    stages {
-                        stage('Checkout') { steps { checkout_project() }}
-                        stage('Build & check format') { steps { 
-						 	sh'''
-						 		python3 -mvenv .venv
-								. .venv/bin/activate
-								pip3 install -r requirements.txt
-						        cmake -S . -B build --preset Release
-						        cmake --build build --target format-check
-						    '''
-						}}
-                    }
-                }
             }
         }
     }