Merge branch 'main' into networking

This commit is contained in:
str1k3r committed 2026-08-04 09:39:41 -04:00
1 parent 64e95393c8
commit de8bf25fbe
50 files changed
+768 -299

No files matched your search

+5 -3
View File
@@ -16,7 +16,7 @@ on:
jobs:
build:
runs-on: windows-2022
runs-on: sdk-orbis
strategy:
matrix:
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
@@ -48,7 +49,8 @@ jobs:
Copy-Item "./ORBIS_${{ inputs.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg
- name: Upload artifacts
uses: https://github.com/actions/upload-artifact@v3
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
with:
name: build-${{ matrix.platform }}
path: staging/*
path: staging/*
compression-level: 0
+6 -4
View File
@@ -16,7 +16,7 @@ on:
jobs:
build:
runs-on: windows-2022
runs-on: sdk-ps3
strategy:
matrix:
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
@@ -37,7 +38,7 @@ jobs:
/m
- name: Zip Build
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"
- name: Stage artifacts
run: |
@@ -45,7 +46,8 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
uses: https://github.com/actions/upload-artifact@v3
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
with:
name: build-${{ matrix.platform }}
path: staging/*
path: staging/*
compression-level: 0
+5 -3
View File
@@ -16,7 +16,7 @@ on:
jobs:
build:
runs-on: windows-2022
runs-on: sdk-psvita
strategy:
matrix:
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
@@ -46,7 +47,8 @@ jobs:
Copy-Item "./PSVita_${{ inputs.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk
- name: Upload artifacts
uses: https://github.com/actions/upload-artifact@v3
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
with:
name: build-${{ matrix.platform }}
path: staging/*
path: staging/*
compression-level: 0
+24 -10
View File
@@ -25,19 +25,31 @@ jobs:
build:
needs: validate
runs-on: windows-2022
strategy:
matrix:
configuration: [Release]
platform: [PS3, Windows64, Orbis] #[PS3, PSVita, Xbox360, ORBIS, Windows64]
platform: [Windows64, Xbox360, Orbis, PSVita, PS3]
include:
- platform: Windows64
sdk_label: windows-2022 # str1k3r - can run on any runner
- platform: Xbox360
sdk_label: sdk-xbox360
- platform: Orbis
sdk_label: sdk-orbis
- platform: PSVita
sdk_label: sdk-psvita
- platform: PS3
sdk_label: sdk-ps3
runs-on: [windows-2022, "${{ matrix.sdk_label }}"]
steps:
- name: Checkout Repository
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
lfs: false
clean: false
lfs: false
- name: Build Cafeberry
run: |
@@ -57,7 +69,7 @@ jobs:
} elseif ("${{ matrix.platform }}" -eq "PSVita") {
7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*"
} elseif ("${{ matrix.platform }}" -eq "PS3") {
7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/PS3_GAME/*"
7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/*" "-x!*.a" "-x!*.pch" "-x!*.elf" "-x!*.self" "-x!*.map"
} elseif ("${{ matrix.platform }}" -eq "Xbox360") {
7z a -r "LCEXbox360.zip" "./X360_${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.xdb"
} else {
@@ -78,17 +90,18 @@ jobs:
}
- name: Upload artifacts
uses: https://github.com/actions/upload-artifact@v3
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
with:
name: build-${{ matrix.platform }}
path: staging/*
compression-level: 0
release:
needs: build
runs-on: windows-2022
steps:
- name: Download all build artifacts
uses: https://github.com/actions/download-artifact@v3
uses: https://github.com/christopherHX/gitea-download-artifact@v4
with:
path: downloaded
@@ -110,9 +123,10 @@ jobs:
}
$delimiter = "EOF_$([System.Guid]::NewGuid().ToString('N'))"
"description<<$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
$body | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
"$delimiter" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8NoBOM
$content = "description<<$delimiter`n$body`n$delimiter`n"
$utf8NoBom = New-Object System.Text.UTF8Encoding($false)
[System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, $content, $utf8NoBom)
- name: Publish Release
uses: akkuman/gitea-release-action@v1
+4 -2
View File
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
@@ -46,7 +47,8 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
uses: https://github.com/actions/upload-artifact@v3
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
with:
name: build-${{ matrix.platform }}
path: staging/*
path: staging/*
compression-level: 0
+5 -3
View File
@@ -16,7 +16,7 @@ on:
jobs:
build:
runs-on: windows-2022
runs-on: sdk-xbox360
strategy:
matrix:
@@ -27,6 +27,7 @@ jobs:
uses: https://github.com/actions/checkout@v4
with:
fetch-depth: 1
clean: false
lfs: false
- name: Build Cafeberry
@@ -48,7 +49,8 @@ jobs:
Copy-Item LCE${{ matrix.platform }}.zip staging/
- name: Upload artifacts
uses: https://github.com/actions/upload-artifact@v3
uses: https://github.com/christopherHX/gitea-upload-artifact@v4
with:
name: build-${{ matrix.platform }}
path: staging/*
path: staging/*
compression-level: 0