More CI fixes

merge-mining
SChernykh 2024-02-12 07:25:49 +01:00
parent 30df7419b7
commit d28090f292
5 changed files with 8 additions and 8 deletions

View File

@ -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:

View File

@ -26,7 +26,7 @@ on:
jobs:
analyze:
name: Analyze
timeout-minutes: 60
timeout-minutes: 180
runs-on: ubuntu-latest
permissions:
actions: read

View File

@ -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
- name: Setup cmake
uses: lukka/get-cmake@latest

View File

@ -28,7 +28,7 @@ env:
jobs:
analyze:
name: Analyze
timeout-minutes: 60
timeout-minutes: 180
runs-on: windows-latest
steps:

View File

@ -219,8 +219,8 @@ public:
{
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;