Merge remote-tracking branch 'origin/master' into documentation

Author: FilipovicLado

.github/actions/setup/action.yml

@@ -10,17 +10,25 @@ runs:
   using: "composite"
 
   steps:
+    - name: Remove unused Homebrew taps
+      shell: bash
+      if: ${{ startsWith(inputs.os, 'macos-') }}
+      run: |
+        brew uninstall --formula azure/bicep/bicep || true
+        brew untap aws/tap azure/bicep || true
+
     - name: 🩹 Enable Long Paths
       shell: bash
       if: ${{ inputs.os == 'windows-latest' }}
       run: git config --system core.longpaths true
 
     - name: 🖥️ Enable MSVC Dev Console
-      uses: ilammy/msvc-dev-cmd@v1
+      if: ${{ inputs.os == 'windows-latest' }}
+      uses: microsoft/setup-msbuild@v3
 
     - name: 📋 Install OpenMP
       shell: bash
-      if: ${{ inputs.os == 'macos-latest' }}
+      if: ${{ startsWith(inputs.os, 'macos-') }}
       run: |
         brew install libomp
         echo "OpenMP_ROOT=$(brew --prefix)/opt/libomp" >> $GITHUB_ENV
@@ -36,7 +44,7 @@ runs:
         echo "CMAKE_GIT_COMMAND=$(which git)" >> "$GITHUB_ENV"
 
     - name: Install Git LFS and configure (macOS)
-      if: ${{ inputs.os == 'macos-latest' }}
+      if: ${{ startsWith(inputs.os, 'macos-') }}
       shell: bash
       run: |
         brew install git-lfs || true
@@ -47,7 +55,6 @@ runs:
 
     - name: 💻 Setup Deployment Target
       shell: bash
-      if: ${{ inputs.os == 'macos-latest' }}
+      if: ${{ startsWith(inputs.os, 'macos-') }}
       run: |
         echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV
-

.github/workflows/build.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
   workflow_dispatch:
 
 jobs:
@@ -20,8 +18,8 @@ jobs:
           - Debug
 
         os:
+          - macos-15-intel
           - macos-latest
-          - windows-latest
 
         include:
           - os: ubuntu-latest
@@ -30,12 +28,14 @@ jobs:
           - os: ubuntu-latest
             config: Debug
             container: ghcr.io/viennatools/vienna-builder:suite
+          - os: windows-latest
+            config: Release+Debug
 
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}
 
     env:
-      VCPKG_COMMIT: c3867e714dd3a51c272826eea77267876517ed99
+      VCPKG_COMMIT: 72d876b20f06129a1b1e0db80c7075fe3e419d7c
       VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/.vcpkg-bincache
 
     name: "🧪 Test on ${{ matrix.os }} (⚙️: ${{ matrix.config }}, 💿: ${{ matrix.container || matrix.os }})"
@@ -49,6 +49,31 @@ jobs:
         with:
           os: ${{ matrix.os }}
 
+      - name: 🔗 Prepare ViennaLS source
+        if: ${{ matrix.os != 'windows-latest' }}
+        run: |
+          VIENNALS_TAG=$(awk '/NAME ViennaLS/{f=1} f && /GIT_TAG/{print $2; exit}' CMakeLists.txt)
+          if ! git ls-remote --tags --exit-code https://github.com/ViennaTools/ViennaLS.git "$VIENNALS_TAG" > /dev/null 2>&1; then
+            echo "[CI] Tag $VIENNALS_TAG not found; cloning master as fallback"
+            rm -rf _viennals
+            git clone --depth 1 --branch master https://github.com/ViennaTools/ViennaLS.git _viennals
+            echo "CPM_ViennaLS_SOURCE=$(pwd)/_viennals" >> "$GITHUB_ENV"
+          fi
+
+      - name: 🔗 Prepare ViennaLS source (Windows)
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: pwsh
+        run: |
+          $content = Get-Content CMakeLists.txt -Raw
+          $viennalsTag = [regex]::Match($content, 'NAME\s+ViennaLS.*?GIT_TAG\s+(\S+)', [System.Text.RegularExpressions.RegexOptions]::Singleline).Groups[1].Value
+          git ls-remote --tags --exit-code https://github.com/ViennaTools/ViennaLS.git $viennalsTag | Out-Null
+          if ($LASTEXITCODE -ne 0) {
+            Write-Host "[CI] Tag $viennalsTag not found; cloning master as fallback"
+            Remove-Item -Recurse -Force _viennals -ErrorAction SilentlyContinue
+            git clone --depth 1 --branch master https://github.com/ViennaTools/ViennaLS.git _viennals
+            if ($LASTEXITCODE -ne 0) { exit 1 }
+            "CPM_ViennaLS_SOURCE=$((Get-Location).Path)/_viennals" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          }
       - name: 🖥️ Setup vcpkg (Windows)
         shell: pwsh
         if: ${{ matrix.os == 'windows-latest' }}
@@ -64,34 +89,64 @@ jobs:
           New-Item -ItemType Directory -Force -Path "${{ env.VCPKG_DEFAULT_BINARY_CACHE }}"
 
       - name: 📋 Install MacOS Dependencies
-        if: ${{ matrix.os == 'macos-latest' }}
+        if: ${{ startsWith(matrix.os, 'macos-') }}
         run: brew install vtk embree tbb
 
-      - name: 🦥 Cache vcpkg binary (Windows)
+      - name: 🔑 Prepare vcpkg cache key (Windows)
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: pwsh
+        run: |
+          $manifest = Get-Content vcpkg.json -Raw | ConvertFrom-Json
+          $cacheKey = [ordered]@{
+            dependencies = $manifest.dependencies
+            features = $manifest.features
+            defaultFeatures = $manifest.'default-features'
+            overrides = $manifest.overrides
+            builtinBaseline = $manifest.'builtin-baseline'
+          }
+          $cacheKey | ConvertTo-Json -Depth 20 | Out-File -FilePath vcpkg-cache-key.json -Encoding utf8
+          Get-Content vcpkg-cache-key.json
+
+      - name: 🦥 Cache vcpkg installed (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
+        id: vcpkg-installed-cache
         uses: actions/cache@v5
         with:
-          path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
-          key: vcpkg-${{ matrix.os }}-${{ matrix.config }}-${{ env.VCPKG_COMMIT }}
+          path: ${{ github.workspace }}/vcpkg_installed
+          key: vcpkg-installed-${{ matrix.os }}-${{ env.VCPKG_COMMIT }}-${{ hashFiles('vcpkg-cache-key.json') }}
+          restore-keys: |
+            vcpkg-installed-${{ matrix.os }}-${{ env.VCPKG_COMMIT }}-
 
       - name: 🛠️ Build Dependencies (Windows)
-        if: ${{ matrix.os == 'windows-latest' }}
+        if: ${{ matrix.os == 'windows-latest' && steps.vcpkg-installed-cache.outputs.cache-hit != 'true' }}
         shell: pwsh
         run: |
           ./vcpkg/vcpkg install --triplet x64-windows
 
       - name: 🏗️ Compile (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
+        shell: pwsh
         run: |
-          cmake -DVIENNAPS_BUILD_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -B build
-          cmake --build build --config ${{ matrix.config }}
+          $cpmArgs = @()
+          if ($env:CPM_ViennaLS_SOURCE) { $cpmArgs += "-DCPM_ViennaLS_SOURCE=$env:CPM_ViennaLS_SOURCE" }
+          cmake -DVIENNAPS_BUILD_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DVCPKG_INSTALLED_DIR=${{ github.workspace }}/vcpkg_installed -DVCPKG_MANIFEST_INSTALL=OFF @cpmArgs -B build
+          cmake --build build --config Release --parallel
+          cmake --build build --config Debug --parallel
 
       - name: 🏗️ Compile (other)
         if: ${{ matrix.os != 'windows-latest' }}
         run: |
-          cmake -DVIENNAPS_BUILD_TESTS=ON -DVIENNAPS_ENABLE_SANITIZER=ON -B build
+          cmake -DVIENNAPS_BUILD_TESTS=ON -DVIENNAPS_ENABLE_SANITIZER=ON ${CPM_ViennaLS_SOURCE:+-DCPM_ViennaLS_SOURCE="$CPM_ViennaLS_SOURCE"} -B build
           cmake --build build --config ${{ matrix.config }}
 
       - name: 🧪 Test
+        if: ${{ matrix.os != 'windows-latest' }}
         run: |
           ctest --output-on-failure -E "Benchmark|Performance" -C ${{ matrix.config }} --test-dir build
+
+      - name: 🧪 Test (Windows)
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: pwsh
+        run: |
+          ctest --output-on-failure -E "Benchmark|Performance" -C Release --test-dir build
+          ctest --output-on-failure -E "Benchmark|Performance" -C Debug --test-dir build

.github/workflows/format.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
   workflow_dispatch:
     inputs:
       debug:
@@ -24,6 +22,16 @@ jobs:
         with:
           set-safe-directory: true
 
+      - name: 🔗 Prepare ViennaLS source
+        run: |
+          VIENNALS_TAG=$(awk '/NAME ViennaLS/{f=1} f && /GIT_TAG/{print $2; exit}' CMakeLists.txt)
+          if ! git ls-remote --tags --exit-code https://github.com/ViennaTools/ViennaLS.git "$VIENNALS_TAG" > /dev/null 2>&1; then
+            echo "[CI] Tag $VIENNALS_TAG not found; cloning master as fallback"
+            rm -rf _viennals
+            git clone --depth 1 --branch master https://github.com/ViennaTools/ViennaLS.git _viennals
+            echo "CPM_ViennaLS_SOURCE=$(pwd)/_viennals" >> "$GITHUB_ENV"
+          fi
+
       - name: 📋 Install additional dependencies
         if: ${{ github.event.inputs.debug == 'true' }}
         run: apk add tmate
@@ -38,5 +46,5 @@ jobs:
       - name: 🔍 Check Format
         run: |
           git config --global --add safe.directory $(pwd) # "set-safe-directory" seems bugged in actions/checkout@v4
-          cmake -B build
+          cmake -B build ${CPM_ViennaLS_SOURCE:+-DCPM_ViennaLS_SOURCE="$CPM_ViennaLS_SOURCE"}
           cmake --build build --target format-check