aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/docker-nightly.yml160
-rw-r--r--.github/workflows/nightly-server.yml78
-rw-r--r--.github/workflows/nightly.yml14
3 files changed, 82 insertions, 170 deletions
diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml
deleted file mode 100644
index 78d5256c..00000000
--- a/.github/workflows/docker-nightly.yml
+++ /dev/null
@@ -1,160 +0,0 @@
-name: Docker Nightly Dedicated Server
-
-on:
- workflow_dispatch:
- push:
- branches:
- - "main"
- - 'feature/dedicated-server'
- paths-ignore:
- - ".gitignore"
- - "*.md"
- - ".github/*.md"
-
-permissions:
- contents: read
- packages: write
-
-concurrency:
- group: docker-nightly-dedicated-server
- cancel-in-progress: true
-
-jobs:
- build-runtime:
- name: Build Dedicated Server Runtime
- runs-on: windows-latest
-
- steps:
- - name: Checkout
- uses: actions/checkout@v6
-
- - name: Setup msbuild
- uses: microsoft/setup-msbuild@v2
-
- - name: Build Dedicated Server Runtime Only
- 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
- uses: actions/upload-artifact@v4
- with:
- name: dedicated-server-runtime
- if-no-files-found: error
- path: |
- .artifacts/dedicated-server-runtime/**
-
- docker-publish:
- name: Build and Push Docker Image
- runs-on: ubuntu-latest
- needs: build-runtime
-
- steps:
- - name: Checkout
- uses: actions/checkout@v6
-
- - name: Download dedicated server runtime from artifacts
- uses: actions/download-artifact@v4
- with:
- name: dedicated-server-runtime
- path: .artifacts/runtime
-
- - name: Prepare Docker runtime directory
- shell: bash
- run: |
- set -euo pipefail
-
- rm -rf runtime
- mkdir -p runtime
- cp .artifacts/runtime/Minecraft.Server.exe runtime/Minecraft.Server.exe
- cp .artifacts/runtime/iggy_w64.dll runtime/iggy_w64.dll
- cp -R .artifacts/runtime/Common runtime/Common
- 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/iggy_w64.dll
- test -d runtime/Common
- test -d runtime/Windows64
-
- - name: Compute image name
- id: image
- shell: bash
- run: |
- 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 "image=ghcr.io/$owner/minecraft-lce-dedicated-server" >> "$GITHUB_OUTPUT"
- echo "image_tag=$image_tag" >> "$GITHUB_OUTPUT"
-
- - name: Extract Docker metadata
- id: meta
- uses: docker/metadata-action@v5
- with:
- images: ${{ steps.image.outputs.image }}
- tags: |
- type=raw,value=${{ steps.image.outputs.image_tag }}
-
- - name: Login to GHCR
- uses: docker/login-action@v3
- with:
- registry: ghcr.io
- username: ${{ secrets.GHCR_USERNAME || github.actor }}
- password: ${{ secrets.GHCR_TOKEN || secrets.GITHUB_TOKEN }}
-
- - name: Build and push image
- uses: docker/build-push-action@v6
- with:
- context: .
- file: docker/dedicated-server/Dockerfile
- push: true
- tags: ${{ steps.meta.outputs.tags }}
- labels: ${{ steps.meta.outputs.labels }}
- build-args: |
- MC_RUNTIME_DIR=runtime \ No newline at end of file
diff --git a/.github/workflows/nightly-server.yml b/.github/workflows/nightly-server.yml
index a55a2a62..23ea2cb7 100644
--- a/.github/workflows/nightly-server.yml
+++ b/.github/workflows/nightly-server.yml
@@ -13,6 +13,11 @@ on:
permissions:
contents: write
+ packages: write
+
+concurrency:
+ group: nightly-server
+ cancel-in-progress: true
jobs:
build:
@@ -27,7 +32,7 @@ jobs:
uses: actions/checkout@v6
- name: Set platform lowercase
- run: echo "PLATFORM=$('${{ matrix.platform }}'.ToLower())" >> $env:GITHUB_ENV
+ run: echo "MATRIX_PLATFORM=$('${{ matrix.platform }}'.ToLower())" >> $env:GITHUB_ENV
- name: Setup MSVC
uses: ilammy/msvc-dev-cmd@v1
@@ -40,12 +45,12 @@ jobs:
env:
VCPKG_ROOT: "" # Disable vcpkg for CI builds
with:
- configurePreset: ${{ env.PLATFORM }}
- buildPreset: ${{ env.PLATFORM }}-release
+ configurePreset: ${{ env.MATRIX_PLATFORM }}
+ buildPreset: ${{ env.MATRIX_PLATFORM }}-release
buildPresetAdditionalArgs: "['--target', 'Minecraft.Server']"
- name: Zip Build
- run: 7z a -r LCEServer${{ matrix.platform }}.zip ./build/${{ env.PLATFORM }}/Minecraft.Server/Release/* -x!*.ipdb -x!*.iobj
+ run: 7z a -r LCEServer${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Server/Release/* -x!*.ipdb -x!*.iobj
- name: Stage artifacts
run: |
@@ -55,7 +60,7 @@ jobs:
- name: Stage exe and pdb
if: matrix.platform == 'Windows64'
run: |
- Copy-Item ./build/${{ env.PLATFORM }}/Minecraft.Server/Release/Minecraft.Server.exe staging/
+ Copy-Item ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Server/Release/Minecraft.Server.exe staging/
- name: Upload artifacts
uses: actions/upload-artifact@v6
@@ -88,6 +93,69 @@ jobs:
files: |
artifacts/*
+ docker-publish:
+ name: Build and Push Docker Image
+ runs-on: ubuntu-latest
+ needs: build
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v6
+
+ - name: Download dedicated server runtime from artifacts
+ uses: actions/download-artifact@v4
+ with:
+ name: build-Windows64
+ path: .artifacts/
+
+ - name: Prepare Docker runtime directory
+ shell: bash
+ run: |
+ set -euo pipefail
+
+ rm -rf runtime
+ mkdir -p runtime
+ unzip .artifacts/LCEServerWindows64.zip -d runtime
+
+ - name: Compute image name
+ id: image
+ shell: bash
+ run: |
+ 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 "image=ghcr.io/$owner/minecraft-lce-dedicated-server" >> "$GITHUB_OUTPUT"
+ echo "image_tag=$image_tag" >> "$GITHUB_OUTPUT"
+
+ - name: Extract Docker metadata
+ id: meta
+ uses: docker/metadata-action@v5
+ with:
+ images: ${{ steps.image.outputs.image }}
+ tags: |
+ type=raw,value=${{ steps.image.outputs.image_tag }}
+
+ - name: Login to GHCR
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ secrets.GHCR_USERNAME || github.actor }}
+ password: ${{ secrets.GHCR_TOKEN || secrets.GITHUB_TOKEN }}
+
+ - name: Build and push image
+ uses: docker/build-push-action@v6
+ with:
+ context: .
+ file: docker/dedicated-server/Dockerfile
+ push: true
+ tags: ${{ steps.meta.outputs.tags }}
+ labels: ${{ steps.meta.outputs.labels }}
+ build-args: |
+ MC_RUNTIME_DIR=runtime
+
cleanup:
needs: [build, release]
if: always()
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ad3a816a..19f6e138 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,6 +14,10 @@ on:
permissions:
contents: write
+concurrency:
+ group: nightly
+ cancel-in-progress: true
+
jobs:
build:
runs-on: windows-latest
@@ -27,7 +31,7 @@ jobs:
uses: actions/checkout@v6
- name: Set platform lowercase
- run: echo "PLATFORM=$('${{ matrix.platform }}'.ToLower())" >> $env:GITHUB_ENV
+ run: echo "MATRIX_PLATFORM=$('${{ matrix.platform }}'.ToLower())" >> $env:GITHUB_ENV
- name: Setup MSVC
uses: ilammy/msvc-dev-cmd@v1
@@ -40,12 +44,12 @@ jobs:
env:
VCPKG_ROOT: "" # Disable vcpkg for CI builds
with:
- configurePreset: ${{ env.PLATFORM }}
- buildPreset: ${{ env.PLATFORM }}-release
+ configurePreset: ${{ env.MATRIX_PLATFORM }}
+ buildPreset: ${{ env.MATRIX_PLATFORM }}-release
buildPresetAdditionalArgs: "['--target', 'Minecraft.Client']"
- name: Zip Build
- run: 7z a -r LCE${{ matrix.platform }}.zip ./build/${{ env.PLATFORM }}/Minecraft.Client/Release/* -x!*.ipdb -x!*.iobj
+ run: 7z a -r LCE${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Client/Release/* -x!*.ipdb -x!*.iobj
- name: Stage artifacts
run: |
@@ -55,7 +59,7 @@ jobs:
- name: Stage exe and pdb
if: matrix.platform == 'Windows64'
run: |
- Copy-Item ./build/${{ env.PLATFORM }}/Minecraft.Client/Release/Minecraft.Client.exe staging/
+ Copy-Item ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Client/Release/Minecraft.Client.exe staging/
- name: Upload artifacts
uses: actions/upload-artifact@v6
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-21 17:17:57 +0000