Merge branch 'main' into version-RC

soumeh01 · web-flow · commit 49520d1b7303 · 2026-06-11T13:48:43.000+02:00
diff --git a/.github/workflows/buildmgr.yml b/.github/workflows/buildmgr.yml
@@ -71,7 +71,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
           fetch-depth: 0
@@ -134,7 +134,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
           fetch-depth: ${{ github.event_name == 'push' && '0' || '1' }}
@@ -182,7 +182,7 @@ jobs:
         run: tar -cvjf /tmp/doc.tbz2 .
         working-directory: ./build/tools/buildmgr/docs/doxygen/output/html/
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         if: ${{ github.event_name == 'push' || github.event_name == 'release' }}
         with:
           ref: gh-pages
@@ -244,7 +244,7 @@ jobs:
             python3
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Create distribution folders
         run: |
@@ -382,7 +382,7 @@ jobs:
         run: choco install -y unzip wget ninja
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
 
@@ -532,7 +532,7 @@ jobs:
             lcov
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: recursive
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -37,12 +37,12 @@ jobs:
           sudo apt-get install ninja-build
 
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v3.29.5
+        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v3.29.5
         with:
           languages: cpp
           queries: security-and-quality
@@ -58,4 +58,4 @@ jobs:
         working-directory: ./build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v3.29.5
+        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v3.29.5
diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml
@@ -39,7 +39,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/global.yaml b/.github/workflows/global.yaml
@@ -18,7 +18,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Check copyright notice
         run: |
diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml
@@ -27,7 +27,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Register markdownlint warning matcher
         run: |
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Check markdown links
         uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2.8.0
diff --git a/.github/workflows/packchk.yml b/.github/workflows/packchk.yml
@@ -78,7 +78,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: recursive
           fetch-depth: 0
@@ -167,7 +167,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: recursive
 
@@ -242,7 +242,7 @@ jobs:
           sudo apt-get install lcov
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: recursive
 
@@ -344,7 +344,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Create distribution folders
         run: |
diff --git a/.github/workflows/packgen.yml b/.github/workflows/packgen.yml
@@ -71,7 +71,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
           fetch-depth: 0
@@ -126,7 +126,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Create distribution folders
         run: |
@@ -201,7 +201,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
 
@@ -254,7 +254,7 @@ jobs:
             lcov
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
 
diff --git a/.github/workflows/projmgr.yml b/.github/workflows/projmgr.yml
@@ -76,7 +76,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
           fetch-depth: 0
@@ -155,7 +155,7 @@ jobs:
 
       - name: Checkout devtools
         if: matrix.pyswig || matrix.goswig
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
 
@@ -216,7 +216,7 @@ jobs:
 
     steps:
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Create distribution folders
         run: |
@@ -384,7 +384,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
 
@@ -446,7 +446,7 @@ jobs:
             lcov
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -31,7 +31,7 @@ jobs:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v3.29.5
+        uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v3.29.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/shared_matrix_prep.yml b/.github/workflows/shared_matrix_prep.yml
@@ -35,7 +35,7 @@ jobs:
           egress-policy: audit
 
       - name: Check out repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - id: set-matrix
         run: |
           publicRepo=$(echo '${{ github.event.repository.private && 'privateRepo' || 'publicRepo' }}')
diff --git a/.github/workflows/svdconv.yml b/.github/workflows/svdconv.yml
@@ -70,7 +70,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: recursive
           fetch-depth: 0
@@ -157,7 +157,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: recursive
 
@@ -233,7 +233,7 @@ jobs:
             lcov
 
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: recursive
 
@@ -342,7 +342,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Create distribution folders
         run: |
diff --git a/.github/workflows/test_libs.yml b/.github/workflows/test_libs.yml
@@ -52,7 +52,7 @@ jobs:
       matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }}
     steps:
       - name: Checkout devtools
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           submodules: true
           fetch-depth: 0
diff --git a/tools/projmgr/CMakeLists.txt b/tools/projmgr/CMakeLists.txt
@@ -24,8 +24,8 @@ include(FetchContent)
 FetchContent_Declare(
   rpc-interface
   DOWNLOAD_EXTRACT_TIMESTAMP ON
-  URL https://github.com/Open-CMSIS-Pack/csolution-rpc/releases/download/v0.0.10/csolution-rpc.zip
-  URL_HASH SHA256=246e1f6e5c1a6e269aeadf37f6bf62897c5bb9d374b7fbfdf0e19af61449379e
+  URL https://github.com/Open-CMSIS-Pack/csolution-rpc/releases/download/v0.0.11/csolution-rpc.zip
+  URL_HASH SHA256=1999e1a158922c319626959384643a8490bac4a716a88fa8868b2fd6701097df
 )
 FetchContent_MakeAvailable(rpc-interface)
 
diff --git a/tools/projmgr/include/ProjMgrWorker.h b/tools/projmgr/include/ProjMgrWorker.h
@@ -96,13 +96,17 @@ struct ToolchainItem {
  *        pack information pack,
  *        path to pack path,
  *        origin file,
+ *        selected-by entry,
+ *        resolved pack identifier,
+ *        missing flag,
 */
 struct PackageItem {
   PackInfo    pack;
   std::string path;
   std::string origin;
   std::string selectedBy;
   std::string resolvedTo;
+  bool missing = false;
 };
 
 /**
@@ -581,6 +585,7 @@ struct ContextItem {
   std::set<RteComponentInstance*> unresolvedComponents;
   StrMap availablePackVersions;
   StrMap absPathSequences;
+  StrVec lockedPacks;
 };
 
 /**
diff --git a/tools/projmgr/src/ProjMgrRpcServer.cpp b/tools/projmgr/src/ProjMgrRpcServer.cpp
@@ -445,24 +445,32 @@ PackReferenceVector RpcHandler::CollectPackReferences(const string& context) {
   PackReferenceVector packRefs;
   auto contextItem = GetContext(context);
   for(const auto& packItem : contextItem.packRequirements) {
-    const auto& packId = packItem.resolvedTo;
-
     RpcArgs::PackReference packRef;
     packRef.pack = packItem.selectedBy;
     if(!packItem.path.empty()) {
       packRef.resolvedPack = packItem.selectedBy;
       packRef.path = packItem.path;
-    } else if(!packId.empty()) {
-      packRef.resolvedPack = packId;
+    } else if(!packItem.resolvedTo.empty()) {
+      packRef.resolvedPack = packItem.resolvedTo;
     }
     packRef.origin = packItem.origin;
     packRef.selected = true; // initially pack is selected;
+    const auto& packId = packItem.pack.vendor + "::" + packItem.pack.name + "@" + packItem.pack.version;
     if(packItem.path.empty() && !packId.empty()) {
       const auto availableVersionIt = contextItem.availablePackVersions.find(packId);
       if(availableVersionIt != contextItem.availablePackVersions.end() && !availableVersionIt->second.empty()) {
         packRef.upgrade = availableVersionIt->second;
       }
     }
+    // set optional 'locked' pack identifier if pack is not resolved and locked pack identifier is tracked
+    if (packItem.resolvedTo.empty() && find(contextItem.lockedPacks.begin(),
+      contextItem.lockedPacks.end(), packId) != contextItem.lockedPacks.end()) {
+      packRef.locked = packId;
+    }
+    // set optional 'missing' if pack is not found
+    if (packItem.missing) {
+      packRef.missing = true;
+    }
     packRefs.push_back(packRef);
   }
   return packRefs;
diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -411,6 +411,7 @@ bool ProjMgrWorker::CollectRequiredPdscFiles(ContextItem& context, const std::st
         auto pdsc = m_kernel->GetEffectivePdscFile(attributes);
         const string& pdscFile = pdsc.second;
         packItem.resolvedTo = pdsc.first; // store resolved ID if any
+        packItem.missing = pdsc.first.empty();
         if (pdscFile.empty()) {
           if (!bPackFilter) {
             std::string packageName =
@@ -1861,9 +1862,12 @@ void ProjMgrWorker::ResolvePackRequirement(ContextItem& context, const PackItem&
     if (!locked.empty()) {
       // TODO: When wildcards will be fully stored in cbuild-pack there may be multiple matches
       const auto& lockedId = locked.front();
+      CollectionUtils::PushBackUniquely(context.lockedPacks, lockedId);
       if (lockedId != packId) {
         // Save available version if different from locked
-        context.availablePackVersions[lockedId] = package.pack.version;
+        if (!packId.empty()) {
+          context.availablePackVersions[lockedId] = package.pack.version;
+        }
         // Keep the locked pack
         packId = lockedId;
         package.pack.version = RtePackage::VersionFromId(lockedId);
diff --git a/tools/projmgr/test/data/TestSolution/PackLocking/pack_reference_locked.cbuild-pack.yml b/tools/projmgr/test/data/TestSolution/PackLocking/pack_reference_locked.cbuild-pack.yml
diff --git a/tools/projmgr/test/data/TestSolution/PackLocking/pack_reference_locked.csolution.yml b/tools/projmgr/test/data/TestSolution/PackLocking/pack_reference_locked.csolution.yml
diff --git a/tools/projmgr/test/src/ProjMgrRpcTests.cpp b/tools/projmgr/test/src/ProjMgrRpcTests.cpp
