More CI fixes

SChernykh · Feb 12, 2024 · b310428 · b310428
1 parent 30df741
commit b310428
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   build-alpine-static:
 
-    timeout-minutes: 120
+    timeout-minutes: 180
     runs-on: ubuntu-22.04
 
     strategy:
@@ -597,7 +597,7 @@ jobs:
 
   build-freebsd:
 
-    timeout-minutes: 75
+    timeout-minutes: 180
     runs-on: ${{ matrix.os.host }}
 
     strategy:
@@ -666,7 +666,7 @@ jobs:
 
   build-openbsd:
 
-    timeout-minutes: 75
+    timeout-minutes: 180
     runs-on: ${{ matrix.os.host }}
 
     strategy:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    timeout-minutes: 60
+    timeout-minutes: 180
     runs-on: ubuntu-latest
     permissions:
       actions: read

diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -79,7 +79,7 @@ jobs:
     - name: Build cppcheck
       run: |
         cd cppcheck-main
-        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild.exe" /m /p:Configuration=Release /p:Platform=x64
+        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild.exe" -v:m /m /p:Configuration=Release /p:Platform=x64 lib\\cppcheck.vcxproj
 
     - name: Setup cmake
       uses: lukka/get-cmake@latest

diff --git a/.github/workflows/msvc-analysis.yml b/.github/workflows/msvc-analysis.yml
@@ -28,7 +28,7 @@ env:
 jobs:
   analyze:
     name: Analyze
-    timeout-minutes: 60
+    timeout-minutes: 180
     runs-on: windows-latest
 
     steps:

diff --git a/src/crypto.cpp b/src/crypto.cpp
@@ -219,8 +219,8 @@ class Cache : public nocopy_nomove
 		{
 			WriteLock lock(derivations_lock);
 
-			DerivationEntry& entry = derivations->emplace(index, DerivationEntry{ derivation, { 0xFFFFFFFFUL, 0xFFFFFFFFUL }, {}, t }).first->second;
-			entry.add_view_tag(static_cast<uint32_t>(output_index << 8) | view_tag);
+			auto entry = derivations->emplace(index, DerivationEntry{ derivation, { 0xFFFFFFFFUL, 0xFFFFFFFFUL }, {}, t }).first;
+			entry->second.add_view_tag(static_cast<uint32_t>(output_index << 8) | view_tag);
 		}
 
 		return true;