Merge branch 'main' into dependabot/github_actions/actions/checkout-6.0.0

brondani · web-flow · commit 00cfe20ddeb4 · 2025-11-26T14:52:42.000+01:00
diff --git a/.github/workflows/buildmgr.yml b/.github/workflows/buildmgr.yml
@@ -314,7 +314,7 @@ jobs:
 
       - name: Attach installer to release
         if: ${{ github.event_name == 'release' }}
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: tools/buildmgr/cbuildgen/installer/cbuild_install.sh
@@ -324,7 +324,7 @@ jobs:
 
       - name: Attach debian installer to release
         if: ${{ github.event_name == 'release' }}
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: tools/buildmgr/cbuildgen/installer/cmsis-build*.deb
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
           submodules: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
+        uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
         with:
           languages: cpp
           queries: security-and-quality
@@ -55,4 +55,4 @@ jobs:
         working-directory: ./build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
+        uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
diff --git a/.github/workflows/packchk.yml b/.github/workflows/packchk.yml
@@ -133,7 +133,7 @@ jobs:
 
       - name: Attach zipped binary to the release
         if: ${{ github.event_name == 'release' }}
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.ref }}
@@ -350,7 +350,7 @@ jobs:
         working-directory: tools/packchk/distribution
 
       - name: Attach zip archive to release assets
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: tools/packchk/distribution/code-coverage.zip
diff --git a/.github/workflows/packgen.yml b/.github/workflows/packgen.yml
@@ -168,7 +168,7 @@ jobs:
         working-directory: tools/packgen/distribution
 
       - name: Attach zip archive to release assets
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: tools/packgen/distribution/packgen.zip
diff --git a/.github/workflows/projmgr.yml b/.github/workflows/projmgr.yml
@@ -299,7 +299,7 @@ jobs:
         working-directory: tools/projmgr/distribution
 
       - name: Attach zip archive to release assets
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: tools/projmgr/distribution/projmgr.zip
@@ -331,7 +331,7 @@ jobs:
         working-directory: tools/testreport
 
       - name: Attach test report archive to release assets
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: tools/testreport/testreport.zip
@@ -350,7 +350,7 @@ jobs:
         working-directory: tools/coverage
 
       - name: Attach coverage archive to release assets
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: tools/coverage/coverage.zip
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
+        uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/svdconv.yml b/.github/workflows/svdconv.yml
@@ -123,7 +123,7 @@ jobs:
 
       - name: Attach svdconv binary to release
         if: ${{ github.event_name == 'release' }}
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.ref }}
@@ -348,7 +348,7 @@ jobs:
         working-directory: tools/svdconv/distribution
 
       - name: Attach zip archive to release assets
-        uses: svenstaro/upload-release-action@81c65b7cd4de9b2570615ce3aad67a41de5b1a13 # v2
+        uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: tools/svdconv/distribution/svdconv.zip
diff --git a/tools/projmgr/include/ProjMgrWorker.h b/tools/projmgr/include/ProjMgrWorker.h
@@ -1113,7 +1113,7 @@ class ProjMgrWorker {
     }
     m_contexts.clear();
     m_ymlOrderedContexts.clear();
-    m_contexts.clear();
+    m_processedContexts.clear();
     m_contextErrMap.clear();
     m_selectedContexts.clear();
     m_outputDir.clear();
diff --git a/tools/projmgr/src/ProjMgr.cpp b/tools/projmgr/src/ProjMgr.cpp
@@ -1291,6 +1291,7 @@ void ProjMgr::Clear() {
 void ProjMgr::InitSolution(const std::string& csolution, const std::string& activeTargetSet, const bool& updateRte) {
   Clear();
   m_csolutionFile = csolution;
+  m_worker.SetCsolutionFile(m_csolutionFile);
   m_rootDir = RteUtils::ExtractFilePath(m_csolutionFile, false);
   m_updateRteFiles = updateRte;
   if (activeTargetSet.empty()) {
diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -455,6 +455,7 @@ bool ProjMgrWorker::InitializeModel() {
   if(m_kernel) {
     // kernel is already initialized, clear pdsc map
     m_kernel->GetPackRegistry()->ClearPdscMap();
+    m_model->SetRootFileName(m_csolutionFile);
     return true;
   }
   m_packRoot = GetPackRoot();
@@ -559,7 +560,7 @@ bool ProjMgrWorker::LoadPacks(ContextItem& context) {
     PrintContextErrors(context.name);
     return false;
   }
-  if (m_loadedPacks.empty() && !LoadAllRelevantPacks()) {
+  if ((m_loadedPacks.empty() || m_rpcMode) && !LoadAllRelevantPacks()) {
     return false;
   }
   // Filter context specific packs
@@ -2254,6 +2255,9 @@ bool ProjMgrWorker::ProcessConfigFiles(ContextItem& context) {
 
 bool ProjMgrWorker::CheckConfigPLMFiles(ContextItem& context) {
   bool error = false;
+  if (!context.rteActiveProject) {
+    return error;
+  }
   for (const auto& fi : context.rteActiveProject->GetFileInstances()) {
     // get absolute path to file instance
     const string file = fs::path(context.cproject->directory).append(fi.second->GetInstanceName()).generic_string();
diff --git a/tools/projmgr/test/src/ProjMgrWorkerUnitTests.cpp b/tools/projmgr/test/src/ProjMgrWorkerUnitTests.cpp
@@ -1859,3 +1859,10 @@ TEST_F(ProjMgrWorkerUnitTests, LoadPacksCaseInsensitive) {
 
   CrossPlatformUtils::SetEnv("CMSIS_PACK_ROOT", cmsisPackRoot);
 }
+
+TEST_F(ProjMgrWorkerUnitTests, CheckConfigPLMFiles_NoRteActiveProject) {
+  ContextItem context;
+  context.rteActiveProject = nullptr;
+  // ensure CheckConfigPLMFiles does not crash when rteActiveProject is not initialized
+  EXPECT_FALSE(CheckConfigPLMFiles(context));
+}

Original file line number	Diff line number	Diff line change
`@@ -1113,7 +1113,7 @@ class ProjMgrWorker {`
`1113`	`1113`	`}`
`1114`	`1114`	`m_contexts.clear();`
`1115`	`1115`	`m_ymlOrderedContexts.clear();`
`1116`		`- m_contexts.clear();`
	`1116`	`+ m_processedContexts.clear();`
`1117`	`1117`	`m_contextErrMap.clear();`
`1118`	`1118`	`m_selectedContexts.clear();`
`1119`	`1119`	`m_outputDir.clear();`