Skip to content

Commit fd8ee39

Browse files
committed
Merge remote-tracking branch 'origin/main' into resolve-pr-819
# Conflicts: # .github/workflows/orchestrator-integrity.yml # dist/index.js # dist/index.js.map # src/model/orchestrator/providers/aws/aws-task-runner.ts # src/model/orchestrator/providers/aws/index.ts
2 parents 0cf2dc1 + 4a7fc08 commit fd8ee39

2 files changed

Lines changed: 33 additions & 3 deletions

File tree

.github/workflows/build-tests-windows.yml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- unityVersion: 6000.0.36f1
4040
targetPlatform: StandaloneWindows64
4141
buildProfile: 'Assets/Settings/Build Profiles/Sample Windows Build Profile.asset'
42-
42+
4343
steps:
4444
###########################
4545
# Checkout #
@@ -66,6 +66,34 @@ jobs:
6666
run: |
6767
Move-Item -Path "./test-project/ProjectSettings/ProjectSettingsIl2cpp.asset" -Destination "./test-project/ProjectSettings/ProjectSettings.asset" -Force
6868
69+
###########################
70+
# Docker Readiness #
71+
###########################
72+
- name: Ensure Docker daemon is ready
73+
timeout-minutes: 2
74+
shell: powershell
75+
run: |
76+
$maxRetries = 10
77+
$retryDelay = 6
78+
for ($i = 0; $i -lt $maxRetries; $i++) {
79+
$svc = Get-Service docker -ErrorAction SilentlyContinue
80+
if ($svc -and $svc.Status -eq 'Running') {
81+
docker version 2>$null
82+
if ($LASTEXITCODE -eq 0) {
83+
Write-Host "Docker is ready."
84+
exit 0
85+
}
86+
}
87+
if ($svc -and $svc.Status -eq 'Stopped') {
88+
Write-Host "Docker service stopped, attempting to start..."
89+
Start-Service docker -ErrorAction SilentlyContinue
90+
}
91+
Write-Host "Waiting for Docker daemon (attempt $($i+1)/$maxRetries)..."
92+
Start-Sleep -Seconds $retryDelay
93+
}
94+
Write-Error "Docker daemon did not start within $($maxRetries * $retryDelay) seconds"
95+
exit 1
96+
6997
###########################
7098
# Build #
7199
###########################
@@ -146,6 +174,8 @@ jobs:
146174
###########################
147175
- uses: actions/upload-artifact@v4
148176
with:
149-
name: Build ${{ matrix.targetPlatform }} on Windows (${{ matrix.unityVersion }})${{ matrix.enableGpu && ' With GPU' || '' }}${{ matrix.buildProfile && ' With Build Profile' || '' }}
177+
name:
178+
Build ${{ matrix.targetPlatform }} on Windows (${{ matrix.unityVersion }})${{ matrix.enableGpu && ' With
179+
GPU' || '' }}${{ matrix.buildProfile && ' With Build Profile' || '' }}
150180
path: build
151181
retention-days: 14

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)