fix workflows

Author: Reobos

.github/workflows/deploy-docs.yml

@@ -37,7 +37,7 @@ jobs:
     needs: prep
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/${{ needs.prep.outputs.repo_lower }}/devcontaine:stable
+      image: ghcr.io/${{ needs.prep.outputs.repo_lower }}/devcontainer:stable-amd64
       options: --user root
       credentials:
         username: ${{ github.actor }}

.github/workflows/sonar-build.yml

@@ -7,9 +7,12 @@ on:
   push:
     branches:
       - main
-      - develop
   pull_request:
     types: [opened, synchronize, reopened]
+
+env:
+  BUILD_TYPE: coverage
+
 jobs:
 
   prep:
@@ -32,7 +35,8 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
+      BUILD_WRAPPER_OUT_DIR: build/${{ env.BUILD_TYPE }}
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
     steps:
       - uses: actions/checkout@v4
@@ -53,15 +57,15 @@ jobs:
 
       - name: Run Build Wrapper
         run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --workflow --preset coverage
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --workflow --preset ${{ env.BUILD_TYPE }}
 
       - name: Collect coverage into one XML report
         run: |
           gcovr --sonarqube > coverage.xml
 
       - name: Run tests to generate coverage statistics
         run: |
-          ctest --test-dir build/coverage
+          ctest --test-dir build/${{ env.BUILD_TYPE }}
 
       - name: SonarQube Scan
         uses: SonarSource/sonarqube-scan-action@v5

CMakePresets.json

@@ -54,14 +54,6 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Instrument"
       }
-    },
-    {
-      "name": "codeql",
-      "displayName": "Build for CodeQL Analysis",
-      "inherits": "debug",
-      "cacheVariables": {
-        "FSB_BUILD_OPENBLAS": "ON"
-      }
     }
   ],
   "buildPresets": [
@@ -94,12 +86,6 @@
       "displayName": "FSB Library Test Address Sanitizer Build",
       "configurePreset": "instrument",
       "targets": ["fsbcore_test", "fsbposix_test", "fsburdf_test"]
-    },
-    {
-      "name": "codeql",
-      "displayName": "FSB Library CodeQL Build",
-      "configurePreset": "codeql",
-      "targets": ["fsbcore_test", "fsbposix_test"]
     }
   ],
   "testPresets": [
@@ -162,20 +148,6 @@
           "name": "coverage"
         }
       ]
-    },
-    {
-      "name": "codeql",
-      "displayName": "FSB Library CodeQL Workflow",
-      "steps": [
-        {
-          "type": "configure",
-          "name": "codeql"
-        },
-        {
-          "type": "build",
-          "name": "codeql"
-        }
-      ]
     }
   ]
 }