More CI Improvements

This commit is contained in:
TheBrokenRail 2024-02-04 00:43:25 -05:00
parent 31fcff13e9
commit 930d0120f3
4 changed files with 21 additions and 11 deletions

View File

@ -85,12 +85,14 @@ jobs:
./out/client/host/usr/bin/minecraft-pi-reborn-client --copy-sdk ./out/client/host/usr/bin/minecraft-pi-reborn-client --copy-sdk
# Build Example Mods # Build Example Mods
- name: Build Example Mods - name: Build Example Mods
run: ./scripts/build-example-mods.sh run: |
cd example-mods
./build.sh
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: Example Mods name: Example Mods
path: ./out/example-mods/* path: ./example-mods/out/*
if-no-files-found: error if-no-files-found: error
# Create Release # Create Release
release: release:

2
.gitignore vendored
View File

@ -12,3 +12,5 @@
/*.AppImage /*.AppImage
/core* /core*
/qemu_* /qemu_*
/example-mods/out
/.testing-tmp

View File

@ -4,13 +4,13 @@ set -e
# Create Output Directory # Create Output Directory
ROOT="$(pwd)" ROOT="$(pwd)"
OUT="${ROOT}/out/example-mods" OUT="${ROOT}/out"
rm -rf "${OUT}" rm -rf "${OUT}"
mkdir -p "${OUT}" mkdir -p "${OUT}"
# Build # Build
for MOD in example-mods/*/; do build() {
cd "${ROOT}/${MOD}" cd "${ROOT}/$1"
# Build # Build
rm -rf build rm -rf build
mkdir build mkdir build
@ -19,4 +19,7 @@ for MOD in example-mods/*/; do
cmake --build . cmake --build .
# Copy Result # Copy Result
cp lib*.so "${OUT}" cp lib*.so "${OUT}"
done }
build chat-commands
build expanded-creative
build recipes

View File

@ -13,18 +13,21 @@ ARCH='host'
export PATH="$(pwd)/out/${MODE}/${ARCH}/usr/bin:${PATH}" export PATH="$(pwd)/out/${MODE}/${ARCH}/usr/bin:${PATH}"
# Make Test Directory # Make Test Directory
rm -rf build/test TEST_WORKING_DIR="$(pwd)/.testing-tmp"
mkdir -p build/test rm -rf "${TEST_WORKING_DIR}"
mkdir -p "${TEST_WORKING_DIR}"
# Run # Run
if [ "${MODE}" = "server" ]; then if [ "${MODE}" = "server" ]; then
# Server Test # Server Test
cd build/test cd "${TEST_WORKING_DIR}"
minecraft-pi-reborn-server --only-generate minecraft-pi-reborn-server --only-generate
cd ../../
else else
# Client Test # Client Test
export _MCPI_SKIP_ROOT_CHECK=1 export _MCPI_SKIP_ROOT_CHECK=1
export HOME="$(pwd)/build/test" export HOME="${TEST_WORKING_DIR}"
minecraft-pi-reborn-client --default --no-cache --benchmark minecraft-pi-reborn-client --default --no-cache --benchmark
fi fi
# Clean Up
rm -rf "${TEST_WORKING_DIR}"