Azure test PokemonAutomation#14

Author: Koi-3088

SerialPrograms/azure-pipelines.yml

@@ -171,7 +171,7 @@ steps:
   - script: |
       pip install --upgrade aqtinstall
       echo "=== Installing Qt (macOS Clang ARM64) ==="
-      aqt install-qt --outputdir $(Build.SourcesDirectory)/Qt mac desktop $(qt_version) macos_arm64 -m qtmultimedia qtserialport
+      aqt install-qt --outputdir $(Build.SourcesDirectory)/Qt mac desktop $(qt_version) -m qtmultimedia qtserialport
     displayName: 'Install Qt (macOS Clang ARM64)'
     condition: and(eq(variables['Agent.OS'], 'Darwin'), eq(variables['architecture'], 'arm64'), ne(variables['QT_CACHE_RESTORED'], 'true'))
 
@@ -197,24 +197,19 @@ steps:
   # Install and cache Linux dependencies
   - script: |
       echo "Installing Linux dependencies..."
-
       # Clean up first to maximize available memory
       sudo apt autoremove -y
       sudo apt autoclean
-
       # Install dependencies without upgrade
       sudo apt update
       sudo apt install -y libopencv-dev libgl1-mesa-dev libglu1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libpulse-dev
-
       echo "Caching dependency list..."
       mkdir -p $(Build.SourcesDirectory)/cached-linux-deps
       echo "libopencv-dev libgl1-mesa-dev libglu1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libpulse-dev" > $(Build.SourcesDirectory)/cached-linux-deps/deps-list.txt
-
       # Additional cleanup after installation
       sudo apt autoremove -y
       sudo apt autoclean
       sudo rm -rf /var/cache/apt/archives/*
-
       echo "Linux dependencies installed and cached"
     displayName: 'Install dependencies (Linux)'
     condition: and(eq(variables['Agent.OS'], 'Linux'), ne(variables['LINUX_DEPS_CACHE_RESTORED'], 'true'))
@@ -233,11 +228,9 @@ steps:
   - script: |
       echo "Installing macOS dependencies..."
       brew install opencv onnxruntime
-      
       echo "Caching dependency list..."
       mkdir -p $(Build.SourcesDirectory)/cached-macos-deps
       echo "opencv onnxruntime" > $(Build.SourcesDirectory)/cached-macos-deps/deps-list.txt
-      
       echo "macOS dependencies installed and cached"
     displayName: 'Install dependencies (macOS)'
     condition: and(eq(variables['Agent.OS'], 'Darwin'), ne(variables['MACOS_DEPS_CACHE_RESTORED'], 'true'))
@@ -263,55 +256,37 @@ steps:
 
   # Windows (MSVC)
   - script: |
-      cmake -S $(Build.SourcesDirectory)/SerialPrograms \
-            -B $(Build.SourcesDirectory)/SerialPrograms/build \
-            -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/msvc2022_64/lib/cmake \
-            $(cmake_additional_param)
+      cmake -S $(Build.SourcesDirectory)/SerialPrograms -B $(Build.SourcesDirectory)/SerialPrograms/build -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/msvc2022_64/lib/cmake $(cmake_additional_param)
     displayName: 'Configure CMake (Windows MSVC)'
     condition: and(eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['compiler'], 'default'))
 
   # Windows (Clang)
   - script: |
-      cmake -S $(Build.SourcesDirectory)/SerialPrograms \
-            -B $(Build.SourcesDirectory)/SerialPrograms/build \
-            -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/msvc2022_64/lib/cmake \
-            $(cmake_additional_param)
+      cmake -S $(Build.SourcesDirectory)/SerialPrograms -B $(Build.SourcesDirectory)/SerialPrograms/build -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/msvc2022_64/lib/cmake $(cmake_additional_param)
     displayName: 'Configure CMake (Windows Clang)'
     condition: and(eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['compiler'], 'clang-cl'))
 
   # Linux (GCC)
   - script: |
-      cmake -S $(Build.SourcesDirectory)/SerialPrograms \
-            -B $(Build.SourcesDirectory)/SerialPrograms/build \
-            -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/gcc_64/lib/cmake \
-            $(cmake_additional_param)
+      cmake -S $(Build.SourcesDirectory)/SerialPrograms -B $(Build.SourcesDirectory)/SerialPrograms/build -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/gcc_64/lib/cmake $(cmake_additional_param)
     displayName: 'Configure CMake (Linux GCC)'
     condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['compiler'], 'default'))
 
   # Linux (Clang)
   - script: |
-      cmake -S $(Build.SourcesDirectory)/SerialPrograms \
-            -B $(Build.SourcesDirectory)/SerialPrograms/build \
-            -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/gcc_64/lib/cmake \
-            $(cmake_additional_param)
+      cmake -S $(Build.SourcesDirectory)/SerialPrograms -B $(Build.SourcesDirectory)/SerialPrograms/build -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/gcc_64/lib/cmake $(cmake_additional_param)
     displayName: 'Configure CMake (Linux Clang)'
     condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['compiler'], 'clang'))
 
   # Mac (ARM64)
   - script: |
-      cmake -S $(Build.SourcesDirectory)/SerialPrograms \
-            -B $(Build.SourcesDirectory)/SerialPrograms/build \
-            -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/macos_arm64/lib/cmake \
-            $(cmake_additional_param)
+      cmake -S $(Build.SourcesDirectory)/SerialPrograms -B $(Build.SourcesDirectory)/SerialPrograms/build -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/macos_arm64/lib/cmake $(cmake_additional_param)
     displayName: 'Configure CMake (macOS ARM64 App Bundle)'
     condition: eq(variables['Agent.OS'], 'Darwin')
 
   # Mac (x86_64)
   - script: |
-      cmake -S $(Build.SourcesDirectory)/SerialPrograms \
-            -B $(Build.SourcesDirectory)/SerialPrograms/build \
-            -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/macos/lib/cmake \
-            $(cmake_additional_param)
+      cmake -S $(Build.SourcesDirectory)/SerialPrograms -B $(Build.SourcesDirectory)/SerialPrograms/build -DCMAKE_PREFIX_PATH=$(Build.SourcesDirectory)/Qt/$(qt_version)/macos/lib/cmake $(cmake_additional_param)
     displayName: 'Configure CMake (macOS x86_64 App Bundle)'
     condition: eq(variables['Agent.OS'], 'Darwin')