build: Update workflows (#1996)

2026-08-03 20:47:12 +01:00 · 2026-07-26 20:37:20 +02:00
parent 4fdc3f0428
commit f6fcb46958
3 changed files with 259 additions and 118 deletions
@@ -146,6 +146,26 @@ jobs:

          printf '%s\n' "$token" > "$RUNNER_TEMP/data/readme.txt"

+          cat > "$RUNNER_TEMP/oem/sync-log.bat" <<'BATCH'
+          @echo off
+          setlocal
+
+          :sync
+          if exist C:\OEM\install.log (
+            copy /Y C:\OEM\install.log \\host.lan\Data\install.tmp >nul 2>&1
+
+            if not errorlevel 1 (
+              move /Y \\host.lan\Data\install.tmp \\host.lan\Data\install.log >nul 2>&1
+            )
+          )
+
+          if /I "%~1"=="once" exit /B
+          if exist C:\OEM\install.done exit /B
+
+          ping 127.0.0.1 -n 6 >nul
+          goto sync
+          BATCH
+
          case "$CALLBACK" in
            powershell)
              cat > "$RUNNER_TEMP/oem/ready.ps1" <<'POWERSHELL'
@@ -156,29 +176,29 @@ jobs:

          $ErrorActionPreference = "Stop"

-          $windows = Get-CimInstance Win32_OperatingSystem
-          $registry = Get-ItemProperty `
-              "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion"
-
-          $platform = switch (
-              $env:PROCESSOR_ARCHITECTURE.ToUpperInvariant()
-          ) {
-              "AMD64" {
-                  "x64"
-              }
-              "ARM64" {
-                  "arm64"
-              }
-              "X86" {
-                  "x86"
-              }
-              default {
-                  $env:PROCESSOR_ARCHITECTURE.ToLowerInvariant()
-              }
-          }
-
          while ($true) {
              try {
+                  $windows = Get-CimInstance Win32_OperatingSystem
+                  $registry = Get-ItemProperty `
+                      "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion"
+
+                  $platform = switch (
+                      $env:PROCESSOR_ARCHITECTURE.ToUpperInvariant()
+                  ) {
+                      "AMD64" {
+                          "x64"
+                      }
+                      "ARM64" {
+                          "arm64"
+                      }
+                      "X86" {
+                          "x86"
+                      }
+                      default {
+                          $env:PROCESSOR_ARCHITECTURE.ToLowerInvariant()
+                      }
+                  }
+
                  $share = (
                      Get-Content `
                          -LiteralPath "\\host.lan\Data\readme.txt" `
@@ -214,6 +234,7 @@ jobs:
                  break
              }
              catch {
+                  Write-Output "$(Get-Date -Format s) - Callback retry: $($_.Exception.Message)"
                  Start-Sleep -Seconds 10
              }
          }
@@ -221,9 +242,17 @@ jobs:

              cat > "$RUNNER_TEMP/oem/install.bat" <<EOF
          @echo off
+          del /Q C:\OEM\install.done 2>nul
+          start "" /B cmd.exe /C C:\OEM\sync-log.bat
+
          powershell.exe -NoProfile -ExecutionPolicy Bypass ^
            -File C:\OEM\ready.ps1 ^
            -Token "$token"
+
+          set "result=%errorlevel%"
+          type nul > C:\OEM\install.done
+          call C:\OEM\sync-log.bat once
+          exit /B %result%
          EOF
              ;;

@@ -327,34 +356,41 @@ jobs:
          Dim temporary
          Dim destination
          Dim file
-
-          Set filesystem = CreateObject("Scripting.FileSystemObject")
-          Set shell = CreateObject("WScript.Shell")
-          Set locator = CreateObject("WbemScripting.SWbemLocator")
-          Set service = locator.ConnectServer(".", "root\cimv2")
-          Set systems = service.ExecQuery("SELECT Caption, Version, BuildNumber FROM Win32_OperatingSystem")
-
-          caption = ""
-          version = ""
-          build = ""
-
-          For Each system In systems
-            caption = CStr(system.Caption)
-            version = CStr(system.Version)
-            build = CStr(system.BuildNumber)
-            Exit For
-          Next
-
-          edition = ReadRegistry(shell, "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\EditionID")
-          platform = GetPlatform(shell)
+          Dim success

          temporary = "\\host.lan\Data\windows.tmp"
          destination = "\\host.lan\Data\windows.json"

          Do
-            On Error Resume Next
+            success = False

-            share = ReadTextFile(filesystem, "\\host.lan\Data\readme.txt")
+            On Error Resume Next
+            Err.Clear
+
+            Set filesystem = CreateObject("Scripting.FileSystemObject")
+            Set shell = CreateObject("WScript.Shell")
+            Set locator = CreateObject("WbemScripting.SWbemLocator")
+            Set service = locator.ConnectServer(".", "root\cimv2")
+            Set systems = service.ExecQuery("SELECT Caption, Version, BuildNumber FROM Win32_OperatingSystem")
+
+            caption = ""
+            version = ""
+            build = ""
+
+            If Err.Number = 0 Then
+              For Each system In systems
+                caption = CStr(system.Caption)
+                version = CStr(system.Version)
+                build = CStr(system.BuildNumber)
+                Exit For
+              Next
+            End If
+
+            If Err.Number = 0 Then
+              edition = ReadRegistry(shell, "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\EditionID")
+              platform = GetPlatform(shell)
+              share = ReadTextFile(filesystem, "\\host.lan\Data\readme.txt")
+            End If

            If Err.Number = 0 Then
              json = _
@@ -371,7 +407,9 @@ jobs:
              Set file = filesystem.OpenTextFile(temporary, ForWriting, True)
              file.Write json
              file.Close
+            End If

+            If Err.Number = 0 Then
              If filesystem.FileExists(destination) Then
                filesystem.DeleteFile destination, True
              End If
@@ -380,20 +418,38 @@ jobs:
            End If

            If Err.Number = 0 Then
-              On Error GoTo 0
-              Exit Do
+              success = True
+            Else
+              WScript.Echo _
+                Now & _
+                " - Callback retry: 0x" & _
+                Hex(Err.Number) & _
+                " - " & _
+                Err.Description
            End If

            Err.Clear
            On Error GoTo 0

+            If success Then
+              Exit Do
+            End If
+
            WScript.Sleep 10000
          Loop
          VBSCRIPT

              cat > "$RUNNER_TEMP/oem/install.bat" <<EOF
          @echo off
+          del /Q C:\OEM\install.done 2>nul
+          start "" /B cmd.exe /C C:\OEM\sync-log.bat
+
          cscript.exe //B //NoLogo C:\OEM\ready.vbs "$token"
+
+          set "result=%errorlevel%"
+          type nul > C:\OEM\install.done
+          call C:\OEM\sync-log.bat once
+          exit /B %result%
          EOF
              ;;
          esac
@@ -434,6 +490,7 @@ jobs:
            --env "RAM_SIZE=half" \
            --env "CPU_CORES=half" \
            --env "CPU_MODEL=$CPU" \
+            --env "LOG=Y" \
            --env "DISK_SIZE=64G" \
            --volume "$RUNNER_TEMP/data:/shared" \
            --volume "$RUNNER_TEMP/oem:/oem:ro" \
@@ -450,10 +507,36 @@ jobs:
            "$CONTAINER" &

          logs_pid="$!"
+          guest_log="$RUNNER_TEMP/data/install.log"
+
+          (
+            offset=0
+            snapshot="$RUNNER_TEMP/install-log.snapshot"
+
+            while true; do
+              if cp "$guest_log" "$snapshot" 2>/dev/null; then
+                size="$(stat -c %s "$snapshot" 2>/dev/null || echo 0)"
+
+                if (( size < offset )); then
+                  offset=0
+                fi
+
+                if (( size > offset )); then
+                  tail -c "+$((offset + 1))" "$snapshot" 2>/dev/null |
+                    sed -u 's/^/[install.bat] /' || true
+                  offset="$size"
+                fi
+              fi
+
+              sleep 2
+            done
+          ) &
+
+          guest_logs_pid="$!"

          stop_logs() {
-            kill "$logs_pid" 2>/dev/null || true
-            wait "$logs_pid" 2>/dev/null || true
+            kill "$logs_pid" "$guest_logs_pid" 2>/dev/null || true
+            wait "$logs_pid" "$guest_logs_pid" 2>/dev/null || true
          }

          trap stop_logs EXIT