master #6

Merged
BRNSystems merged 85 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-09 17:53:52 +01:00
2 changed files with 15 additions and 7 deletions
Showing only changes of commit 704b5d88b9 - Show all commits

@ -175,9 +175,13 @@ jobs:
- name: Build - name: Build
run: | run: |
EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh winbuild EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh B
env:
NO_PACKAGE: 1 - uses: actions/upload-artifact@v3
with:
name: mingw32
path: B/build/*.zip
if-no-files-found: error
win64: win64:
name: "MinGW cross-compiler (64-bit)" name: "MinGW cross-compiler (64-bit)"
@ -192,9 +196,13 @@ jobs:
- name: Build - name: Build
run: | run: |
EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh winbuild EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh B
env:
NO_PACKAGE: 1 - uses: actions/upload-artifact@v3
with:
name: mingw64
path: B/build/*.zip
if-no-files-found: error
msvc: msvc:
name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}

@ -53,7 +53,7 @@ get_sources
git_hash=$(cd $sourcedir && git rev-parse --short HEAD) git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
# Build the thing # Build the thing
cd $sourcedir cd $builddir
[ -d build ] && rm -rf build [ -d build ] && rm -rf build
cmake_args=( cmake_args=(