Skip to content

Commit f543598

Browse files
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla
2 parents 6e42854 + e502199 commit f543598

15 files changed

Lines changed: 1579 additions & 138 deletions

.github/workflows/build-nabla.yml

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,35 @@ jobs:
5050
Set-MpPreference -DisableArchiveScanning $true
5151
Set-MpPreference -DisableScanningMappedNetworkDrivesForFullScan $true
5252
53-
if (-not (docker network ls --format '{{.Name}}' | Where-Object { $_ -eq 'docker_default' })) {
54-
docker network create --driver nat docker_default
55-
if ($LASTEXITCODE -ne 0) { exit 1 }
53+
$maxAttempts = 12
54+
$delaySeconds = 5
55+
$dockerReady = $false
56+
57+
for ($attempt = 1; $attempt -le $maxAttempts; $attempt++) {
58+
$networkNames = docker network ls --format '{{.Name}}'
59+
if ($LASTEXITCODE -eq 0) {
60+
if (-not ($networkNames | Where-Object { $_ -eq 'docker_default' })) {
61+
docker network create --driver nat docker_default
62+
if ($LASTEXITCODE -eq 0) {
63+
$dockerReady = $true
64+
break
65+
}
66+
}
67+
else {
68+
$dockerReady = $true
69+
break
70+
}
71+
}
72+
73+
if ($attempt -lt $maxAttempts) {
74+
Write-Host "Docker not ready yet (attempt $attempt/$maxAttempts), retry in ${delaySeconds}s..."
75+
Start-Sleep -Seconds $delaySeconds
76+
}
77+
}
78+
79+
if (-not $dockerReady) {
80+
Write-Error "Docker was not ready after $($maxAttempts*$delaySeconds)s total wait"
81+
exit 1
5682
}
5783
5884
- name: Set prefix
@@ -385,11 +411,11 @@ jobs:
385411
if (-not (Test-Path "smoke/build-ct/install")) { throw "smoke/build-ct/install not found" }
386412
tree.com smoke /F
387413
388-
- name: Configure Smoke
389-
run: cmake -S smoke -B smoke/out
414+
- name: Smoke Flow MINIMALISTIC
415+
run: cmake -D FLOW=MINIMALISTIC -D CONFIG=${{ matrix.config }} -P smoke/RunSmokeFlow.cmake
390416

391-
- name: Build Smoke
392-
run: cmake --build smoke/out --config ${{ matrix.config }}
417+
- name: Smoke Flow CONFIGURE_ONLY
418+
run: cmake -D FLOW=CONFIGURE_ONLY -D CONFIG=${{ matrix.config }} -P smoke/RunSmokeFlow.cmake
393419

394-
- name: CTest Smoke
395-
run: ctest --verbose --test-dir smoke/out --force-new-ctest-process --output-on-failure --no-tests=error -C ${{ matrix.config }}
420+
- name: Smoke Flow BUILD_ONLY
421+
run: cmake -D FLOW=BUILD_ONLY -D CONFIG=${{ matrix.config }} -P smoke/RunSmokeFlow.cmake

.github/workflows/run-nsc.yml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,35 @@ jobs:
5151
Set-MpPreference -DisableArchiveScanning $true
5252
Set-MpPreference -DisableScanningMappedNetworkDrivesForFullScan $true
5353
54-
if (-not (docker network ls --format '{{.Name}}' | Where-Object { $_ -eq 'docker_default' })) {
55-
docker network create --driver nat docker_default
56-
if ($LASTEXITCODE -ne 0) { exit 1 }
54+
$maxAttempts = 12
55+
$delaySeconds = 5
56+
$dockerReady = $false
57+
58+
for ($attempt = 1; $attempt -le $maxAttempts; $attempt++) {
59+
$networkNames = docker network ls --format '{{.Name}}'
60+
if ($LASTEXITCODE -eq 0) {
61+
if (-not ($networkNames | Where-Object { $_ -eq 'docker_default' })) {
62+
docker network create --driver nat docker_default
63+
if ($LASTEXITCODE -eq 0) {
64+
$dockerReady = $true
65+
break
66+
}
67+
}
68+
else {
69+
$dockerReady = $true
70+
break
71+
}
72+
}
73+
74+
if ($attempt -lt $maxAttempts) {
75+
Write-Host "Docker not ready yet (attempt $attempt/$maxAttempts), retry in ${delaySeconds}s..."
76+
Start-Sleep -Seconds $delaySeconds
77+
}
78+
}
79+
80+
if (-not $dockerReady) {
81+
Write-Error "Docker was not ready after $($maxAttempts*$delaySeconds)s total wait"
82+
exit 1
5783
}
5884
5985
$sendDiscord = "${{ inputs.withDiscordMSG }}" -eq "true"

0 commit comments

Comments
 (0)