finally fix uwp build ci

This commit is contained in:
RandomityGuy 2025-06-28 14:00:38 +05:30
parent 00bc46f681
commit 72ff57a290

View file

@ -531,8 +531,6 @@ jobs:
git checkout uwp-compat git checkout uwp-compat
"/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHASHLINK_LIBRARY_DIR="~/deps/hashlink/build/bin" -DHASHLINK_INCLUDE_DIR="../../hashlink/src" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 "/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHASHLINK_LIBRARY_DIR="~/deps/hashlink/build/bin" -DHASHLINK_INCLUDE_DIR="../../hashlink/src" -DCMAKE_POLICY_VERSION_MINIMUM=3.5
"/c/Program Files/CMake/bin/cmake" --build build --config Release -j4 "/c/Program Files/CMake/bin/cmake" --build build --config Release -j4
mv ~/deps/hxDatachannel/cpp/build/Release/datachannel.hdll ~/deps/hashlink/build/bin/
mv ~/deps/hxDatachannel/cpp/build/Release/datachannel.lib ~/deps/hashlink/build/bin/
- run: - run:
name: Install haxe dependencies name: Install haxe dependencies
@ -559,40 +557,30 @@ jobs:
export PATH=$nekopath:"$PATH" export PATH=$nekopath:"$PATH"
cd ~/project cd ~/project
haxe compile-uwp.hxml haxe compile-uwp.hxml
HASHLINKPATH=~/deps/hashlink
MSBuild.exe -m -nologo -p:Configuration=Release -p:Platform=x64 -p:PlatformToolset=v142 -p:HASHLINK=$HASHLINKPATH marblegame.sln
cd uwp cd uwp
"/c/Program Files/CMake/bin/cmake" -B build_vs -G "Visual Studio 17 2022" -A x64 -T v142 -DDATACHANNEL_DIR=~/deps/hxDatachannel/cpp/build/Release -DHASHLINK_DIR=~/deps/hashlink/build/bin -DMBHAXE_DIR=../native/x64/Release "/c/Program Files/CMake/bin/cmake" -B build_vs -G "Visual Studio 17 2022" -A x64 -T v142 -DDATACHANNEL_DIR=~/deps/hxDatachannel/cpp/build/Release -DHASHLINK_DIR=~/deps/hashlink/build/bin -DMBHAXE_DIR=../native/x64/Release
"/c/Program Files/CMake/bin/cmake" --build build_vs --config Release -j4
cd native cd native
HASHLINKPATH=~/deps/hashlink HASHLINKPATH=~/deps/hashlink
- run: - run:
name: Package app bundle name: Package app bundle
command: | command: |
cd ~/project cd ~/project/uwp/build_vs/AppPackages/mbhaxe-uwp/
mkdir release MSIX_FILE=$(powershell -Command "Get-ChildItem -Path . -Filter '*.msix' -Recurse | Select-Object -First 1 -ExpandProperty FullName")
cd release if [ -n "$MSIX_FILE" ]; then
cp ../native/x64/Release/marblegame.exe . cp "$MSIX_FILE" ~/project/MBHaxe-Ultra-UWP.msix
mv marblegame.exe marbleblast.exe else
cp -r ../data . echo "Error: Could not find .msix file"
cp ~/deps/hashlink/x64/Release/libhl.dll . exit 1
cp ~/deps/hashlink/x64/Release/fmt.hdll . fi
cp ~/deps/hashlink/x64/Release/ui.hdll .
cp ~/deps/hashlink/x64/Release/openal.hdll .
cp ~/deps/hashlink/x64/Release/sdl.hdll .
cp ~/deps/hashlink/x64/Release/ssl.hdll .
cp ~/deps/hashlink/x64/Release/datachannel.hdll .
cp ~/deps/hashlink/x64/Release/uv.hdll .
cp ~/deps/hashlink/include/sdl/lib/x64/SDL2.dll .
cp ~/deps/hashlink/include/openal/bin/Win64/soft_oal.dll ./OpenAL32.dll
- run:
name: Zip bundle
command: |
cd ~/project
7z a MBHaxe-Ultra-Win.zip release/
- run: - run:
name: Upload to Artifact Storage name: Upload to Artifact Storage
command: | command: |
scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/project/MBHaxe-Ultra-Win.zip $REMOTEDIR/MBHaxe-Ultra-Win.zip scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/project/MBHaxe-Ultra-UWP.msix $REMOTEDIR/MBHaxe-Ultra-UWP.msix
# - store_artifacts: # - store_artifacts:
# path: ~/project/MBHaxe-Platinum-Win.zip # path: ~/project/MBHaxe-Platinum-Win.zip
@ -614,7 +602,7 @@ workflows:
tags: tags:
only: /^\d+.\d+.\d+$/ only: /^\d+.\d+.\d+$/
build-uwp: build-universal-windows:
jobs: jobs:
- build-uwp: - build-uwp:
filters: filters: