mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
fix: fix Docker workflow for Dedicated Server artifact handling
This commit is contained in:
parent
e21bd1614c
commit
6f0e5317b4
84
.github/workflows/docker-nightly.yml
vendored
84
.github/workflows/docker-nightly.yml
vendored
|
|
@ -5,6 +5,7 @@ on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- "main"
|
- "main"
|
||||||
|
- 'feature/dedicated-server'
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- ".gitignore"
|
- ".gitignore"
|
||||||
- "*.md"
|
- "*.md"
|
||||||
|
|
@ -30,8 +31,51 @@ jobs:
|
||||||
- name: Setup msbuild
|
- name: Setup msbuild
|
||||||
uses: microsoft/setup-msbuild@v2
|
uses: microsoft/setup-msbuild@v2
|
||||||
|
|
||||||
- name: Build Dedicated Server
|
- name: Build Dedicated Server Runtime Only
|
||||||
run: MSBuild.exe MinecraftConsoles.sln /p:Configuration=Release /p:Platform="Windows64" /t:"Minecraft.World;Minecraft.Server" /m
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
MSBuild.exe Minecraft.World\Minecraft.World.vcxproj /p:Configuration=Release /p:Platform=x64 /m
|
||||||
|
MSBuild.exe Minecraft.Server\Minecraft.Server.vcxproj /p:Configuration=Release /p:Platform=x64 /m
|
||||||
|
|
||||||
|
- name: Stage dedicated server runtime
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
$serverOut = "Minecraft.Server/x64/Minecraft.Server/Release"
|
||||||
|
$stage = ".artifacts/dedicated-server-runtime"
|
||||||
|
|
||||||
|
if (Test-Path $stage) {
|
||||||
|
Remove-Item -Path $stage -Recurse -Force
|
||||||
|
}
|
||||||
|
|
||||||
|
New-Item -ItemType Directory -Path (Join-Path $stage "Windows64") -Force | Out-Null
|
||||||
|
|
||||||
|
# Minimum required runtime files
|
||||||
|
$required = @(
|
||||||
|
"Minecraft.Server.exe",
|
||||||
|
"iggy_w64.dll",
|
||||||
|
"Common"
|
||||||
|
)
|
||||||
|
|
||||||
|
foreach ($entry in $required) {
|
||||||
|
$src = Join-Path $serverOut $entry
|
||||||
|
if (-not (Test-Path $src)) {
|
||||||
|
throw "Missing required runtime path: $src"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Copy required files
|
||||||
|
Copy-Item -Path (Join-Path $serverOut "Minecraft.Server.exe") -Destination (Join-Path $stage "Minecraft.Server.exe") -Force
|
||||||
|
Copy-Item -Path (Join-Path $serverOut "iggy_w64.dll") -Destination (Join-Path $stage "iggy_w64.dll") -Force
|
||||||
|
Copy-Item -Path (Join-Path $serverOut "Common") -Destination (Join-Path $stage "Common") -Recurse -Force
|
||||||
|
if (Test-Path (Join-Path $serverOut "Windows64")) {
|
||||||
|
Copy-Item -Path (Join-Path $serverOut "Windows64/*") -Destination (Join-Path $stage "Windows64") -Recurse -Force
|
||||||
|
} else {
|
||||||
|
Write-Host "Windows64 directory is not present in build output; staging without it."
|
||||||
|
}
|
||||||
|
|
||||||
|
Get-ChildItem -Path $stage -Recurse -File | Select-Object -First 20 | ForEach-Object {
|
||||||
|
Write-Host "Staged: $($_.FullName)"
|
||||||
|
}
|
||||||
|
|
||||||
- name: Upload dedicated server runtime to artifacts
|
- name: Upload dedicated server runtime to artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
|
@ -39,10 +83,7 @@ jobs:
|
||||||
name: dedicated-server-runtime
|
name: dedicated-server-runtime
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
path: |
|
path: |
|
||||||
x64/Minecraft.Server/Release/Minecraft.Server.exe
|
.artifacts/dedicated-server-runtime/**
|
||||||
x64/Minecraft.Server/Release/iggy_w64.dll
|
|
||||||
x64/Minecraft.Server/Release/Common/**
|
|
||||||
x64/Minecraft.Server/Release/Windows64/**
|
|
||||||
|
|
||||||
docker-publish:
|
docker-publish:
|
||||||
name: Build and Push Docker Image
|
name: Build and Push Docker Image
|
||||||
|
|
@ -64,25 +105,15 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
root=".artifacts/runtime"
|
|
||||||
src=""
|
|
||||||
|
|
||||||
if [[ -f "$root/Minecraft.Server.exe" ]]; then
|
|
||||||
src="$root"
|
|
||||||
elif [[ -f "$root/x64/Minecraft.Server/Release/Minecraft.Server.exe" ]]; then
|
|
||||||
src="$root/x64/Minecraft.Server/Release"
|
|
||||||
else
|
|
||||||
echo "Could not find Minecraft.Server.exe in downloaded artifact"
|
|
||||||
find "$root" -maxdepth 6 -type f || true
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf runtime
|
rm -rf runtime
|
||||||
mkdir -p runtime
|
mkdir -p runtime
|
||||||
cp "$src/Minecraft.Server.exe" runtime/Minecraft.Server.exe
|
cp .artifacts/runtime/Minecraft.Server.exe runtime/Minecraft.Server.exe
|
||||||
cp "$src/iggy_w64.dll" runtime/iggy_w64.dll
|
cp .artifacts/runtime/iggy_w64.dll runtime/iggy_w64.dll
|
||||||
cp -R "$src/Common" runtime/Common
|
cp -R .artifacts/runtime/Common runtime/Common
|
||||||
cp -R "$src/Windows64" runtime/Windows64
|
mkdir -p runtime/Windows64
|
||||||
|
if [[ -d ".artifacts/runtime/Windows64" ]]; then
|
||||||
|
cp -R .artifacts/runtime/Windows64/. runtime/Windows64/
|
||||||
|
fi
|
||||||
|
|
||||||
test -f runtime/Minecraft.Server.exe
|
test -f runtime/Minecraft.Server.exe
|
||||||
test -f runtime/iggy_w64.dll
|
test -f runtime/iggy_w64.dll
|
||||||
|
|
@ -94,8 +125,13 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
owner="$(echo "${{ vars.CONTAINER_REGISTRY_OWNER || github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
|
owner="$(echo "${{ vars.CONTAINER_REGISTRY_OWNER || github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
|
||||||
|
image_tag="nightly"
|
||||||
|
# if [[ "${{ github.ref }}" != "refs/heads/main" ]]; then
|
||||||
|
# image_tag="nightly-test"
|
||||||
|
# fi
|
||||||
echo "owner=$owner" >> "$GITHUB_OUTPUT"
|
echo "owner=$owner" >> "$GITHUB_OUTPUT"
|
||||||
echo "image=ghcr.io/$owner/minecraft-lce-dedicated-server" >> "$GITHUB_OUTPUT"
|
echo "image=ghcr.io/$owner/minecraft-lce-dedicated-server" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "image_tag=$image_tag" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Extract Docker metadata
|
- name: Extract Docker metadata
|
||||||
id: meta
|
id: meta
|
||||||
|
|
@ -103,7 +139,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
images: ${{ steps.image.outputs.image }}
|
images: ${{ steps.image.outputs.image }}
|
||||||
tags: |
|
tags: |
|
||||||
type=raw,value=nightly
|
type=raw,value=${{ steps.image.outputs.image_tag }}
|
||||||
|
|
||||||
- name: Login to GHCR
|
- name: Login to GHCR
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue