From b02b381af26c792d7f7feaa93198bb7efb2512de Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 16 Jan 2022 15:54:08 +0100 Subject: Bump IrrlichtMt to 1.9.0mt4 in CI --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/macos.yml') diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d97cff1aa..69253b70a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,7 @@ on: - '.github/workflows/macos.yml' env: - IRRLICHT_TAG: 1.9.0mt3 + IRRLICHT_TAG: 1.9.0mt4 MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git MINETEST_GAME_BRANCH: master MINETEST_GAME_NAME: minetest_game -- cgit v1.2.3 From ea2fba877a6d1d1170bc64bc9586edb615da584d Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Wed, 1 Dec 2021 18:32:41 -0500 Subject: Use build directory for builds --- .github/workflows/macos.yml | 4 ++-- .gitlab-ci.yml | 4 ++-- README.md | 4 ++-- util/ci/build.sh | 4 ++-- util/ci/clang-tidy.sh | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to '.github/workflows/macos.yml') diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 69253b70a..68813f961 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -45,8 +45,8 @@ jobs: git clone -b $MINETEST_GAME_BRANCH $MINETEST_GAME_REPO games/$MINETEST_GAME_NAME rm -rvf games/$MINETEST_GAME_NAME/.git git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt - mkdir cmakebuild - cd cmakebuild + mkdir build + cd build cmake .. \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \ -DCMAKE_FIND_FRAMEWORK=LAST \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index feb334bee..626fd022b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,8 @@ variables: - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev script: - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt - - mkdir cmakebuild - - cd cmakebuild + - mkdir build + - cd build - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE .. - make -j2 - make install diff --git a/README.md b/README.md index 8f089ab48..8ecaabea0 100644 --- a/README.md +++ b/README.md @@ -418,8 +418,8 @@ git clone --depth 1 https://github.com/minetest/irrlicht.git lib/irrlichtmt #### Build ```bash -mkdir cmakebuild -cd cmakebuild +mkdir build +cd build cmake .. \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \ diff --git a/util/ci/build.sh b/util/ci/build.sh index ba77cd645..32b5c92a7 100755 --- a/util/ci/build.sh +++ b/util/ci/build.sh @@ -1,7 +1,7 @@ #! /bin/bash -e -mkdir cmakebuild -cd cmakebuild +mkdir build +cd build cmake -DCMAKE_BUILD_TYPE=Debug \ -DRUN_IN_PLACE=TRUE -DENABLE_GETTEXT=TRUE \ -DBUILD_SERVER=TRUE ${CMAKE_FLAGS} .. diff --git a/util/ci/clang-tidy.sh b/util/ci/clang-tidy.sh index bb4e99fef..74578eeac 100755 --- a/util/ci/clang-tidy.sh +++ b/util/ci/clang-tidy.sh @@ -1,7 +1,7 @@ #! /bin/bash -eu -mkdir -p cmakebuild -cd cmakebuild +mkdir -p build +cd build cmake -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DRUN_IN_PLACE=TRUE \ @@ -12,6 +12,6 @@ make GenerateVersion cd .. ./util/ci/run-clang-tidy.py \ - -clang-tidy-binary=clang-tidy-9 -p cmakebuild \ + -clang-tidy-binary=clang-tidy-9 -p build \ -quiet -config="$(cat .clang-tidy)" \ 'src/.*' -- cgit v1.2.3 From e108954633df9e4b2e235dd8e16b64f846a2d251 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 1 May 2022 14:44:48 +0200 Subject: Sort out some issues with our CI setup * add missing apt-get update where needed * move some jobs to run on ubuntu-20.04 * update actions plugins to latest * speed up the job that runs multiplayer tests --- .github/workflows/android.yml | 6 +++--- .github/workflows/build.yml | 31 +++++++++++++++---------------- .github/workflows/cpp_lint.yml | 14 +++++++------- .github/workflows/lua.yml | 11 ++++++----- .github/workflows/macos.yml | 4 ++-- README.md | 1 - util/ci/common.sh | 3 --- 7 files changed, 33 insertions(+), 37 deletions(-) (limited to '.github/workflows/macos.yml') diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index cc5fe83ef..20411a332 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -23,7 +23,7 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | sudo apt-get update @@ -31,12 +31,12 @@ jobs: - name: Build with Gradle run: cd android; ./gradlew assemblerelease - name: Save armeabi artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Minetest-armeabi-v7a.apk path: android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk - name: Save arm64 artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Minetest-arm64-v8a.apk path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61b9833be..340f1c604 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: gcc_5: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | source ./util/ci/common.sh @@ -55,7 +55,7 @@ jobs: gcc_10: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | source ./util/ci/common.sh @@ -76,7 +76,7 @@ jobs: clang_3_9: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | source ./util/ci/common.sh @@ -101,7 +101,7 @@ jobs: clang_10: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | source ./util/ci/common.sh @@ -126,9 +126,9 @@ jobs: # Build with prometheus-cpp (server-only) clang_9_prometheus: name: "clang_9 (PROMETHEUS=1)" - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | source ./util/ci/common.sh @@ -152,9 +152,9 @@ jobs: docker: name: "Docker image" - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build docker image run: | docker build . -t minetest:latest @@ -164,10 +164,10 @@ jobs: name: "MinGW cross-compiler (32-bit)" runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install compiler run: | - sudo apt-get update -q && sudo apt-get install gettext -qyy + sudo apt-get update && sudo apt-get install -y gettext wget http://minetest.kitsunemimi.pw/mingw-w64-i686_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz sudo tar -xaf mingw.tar.xz -C /usr @@ -182,10 +182,10 @@ jobs: name: "MinGW cross-compiler (64-bit)" runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install compiler run: | - sudo apt-get update -q && sudo apt-get install gettext -qyy + sudo apt-get update && sudo apt-get install -y gettext wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz sudo tar -xaf mingw.tar.xz -C /usr @@ -223,10 +223,9 @@ jobs: # Enable it, when working on the installer. steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - - name: Checkout IrrlichtMT + - name: Checkout IrrlichtMt uses: actions/checkout@v3 with: repository: minetest/irrlicht @@ -269,7 +268,7 @@ jobs: - name: Package Clean run: rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: msvc-${{ matrix.config.arch }}-${{ matrix.type }} path: .\Package\ diff --git a/.github/workflows/cpp_lint.yml b/.github/workflows/cpp_lint.yml index 2bd884c7a..581ee06d6 100644 --- a/.github/workflows/cpp_lint.yml +++ b/.github/workflows/cpp_lint.yml @@ -26,12 +26,13 @@ on: jobs: # clang_format: -# runs-on: ubuntu-18.04 +# runs-on: ubuntu-20.04 # steps: -# - uses: actions/checkout@v2 +# - uses: actions/checkout@v3 # - name: Install clang-format # run: | -# sudo apt-get install clang-format-9 -qyy +# sudo apt-get update +# sudo apt-get install -y clang-format-9 # # - name: Run clang-format # run: | @@ -41,14 +42,13 @@ jobs: # CLANG_FORMAT: clang-format-9 clang_tidy: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | - sudo apt-get install clang-tidy-9 -qyy source ./util/ci/common.sh - install_linux_deps + install_linux_deps clang-tidy-9 - name: Run clang-tidy run: | diff --git a/.github/workflows/lua.yml b/.github/workflows/lua.yml index 0fa30bb15..3af4a6ee7 100644 --- a/.github/workflows/lua.yml +++ b/.github/workflows/lua.yml @@ -19,11 +19,11 @@ jobs: name: "Compile and run multiplayer tests" runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | source ./util/ci/common.sh - install_linux_deps clang-10 gdb + install_linux_deps clang-10 gdb libluajit-5.1-dev - name: Build run: | @@ -31,6 +31,7 @@ jobs: env: CC: clang-10 CXX: clang++-10 + CMAKE_FLAGS: "-DENABLE_GETTEXT=0 -DBUILD_SERVER=0" - name: Integration test + devtest run: | @@ -38,12 +39,12 @@ jobs: luacheck: name: "Builtin Luacheck and Unit Tests" - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install luarocks run: | - sudo apt-get install luarocks -qyy + sudo apt-get update && sudo apt-get install -y luarocks - name: Install luarocks tools run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 68813f961..1f1772bf3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -31,7 +31,7 @@ jobs: build: runs-on: macos-10.15 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install deps run: | pkgs=(cmake freetype gettext gmp hiredis jpeg jsoncpp leveldb libogg libpng libvorbis luajit zstd) @@ -60,7 +60,7 @@ jobs: run: | ./build/macos/minetest.app/Contents/MacOS/minetest --run-unittests - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: minetest-macos path: ./build/macos/ diff --git a/README.md b/README.md index 8ecaabea0..f6fdd0faf 100644 --- a/README.md +++ b/README.md @@ -305,7 +305,6 @@ Library specific options: VORBIS_DLL - Only if building with sound on Windows; paths to vorbis DLLs VORBIS_INCLUDE_DIR - Only if building with sound; directory that contains a directory vorbis with vorbisenc.h inside VORBIS_LIBRARY - Only if building with sound; path to libvorbis.a/libvorbis.so/libvorbis.dll.a - XXF86VM_LIBRARY - Only on Linux; path to libXXf86vm.a/libXXf86vm.so ZLIB_DLL - Only on Windows; path to zlib1.dll ZLIB_INCLUDE_DIR - Directory that contains zlib.h ZLIB_LIBRARY - Path to libz.a/libz.so/zlib.lib diff --git a/util/ci/common.sh b/util/ci/common.sh index f9df54c4a..2802a004a 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -17,9 +17,6 @@ install_linux_deps() { sudo apt-get update sudo apt-get install -y --no-install-recommends ${pkgs[@]} "$@" - - # workaround for bug with Github Actions' ubuntu-18.04 image - sudo apt-get remove -y libgcc-11-dev gcc-11 || : } # Mac OSX build only -- cgit v1.2.3 From 4e1de06782b2541e8d487adfd87b0c2afeedeab3 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 6 May 2022 14:45:59 +0200 Subject: Bump IrrlichtMt to 1.9.0mt5 in CI --- .github/workflows/build.yml | 2 +- .github/workflows/macos.yml | 2 +- .gitlab-ci.yml | 2 +- util/buildbot/buildwin32.sh | 4 ++-- util/buildbot/buildwin64.sh | 2 +- util/ci/common.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to '.github/workflows/macos.yml') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 340f1c604..2cc83923b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -230,7 +230,7 @@ jobs: with: repository: minetest/irrlicht path: lib/irrlichtmt/ - ref: "1.9.0mt4" + ref: "1.9.0mt5" - name: Restore from cache and run vcpkg uses: lukka/run-vcpkg@v7 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1f1772bf3..c0278a38c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,7 @@ on: - '.github/workflows/macos.yml' env: - IRRLICHT_TAG: 1.9.0mt4 + IRRLICHT_TAG: 1.9.0mt5 MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git MINETEST_GAME_BRANCH: master MINETEST_GAME_NAME: minetest_game diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81007d7c7..c225bfcd4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: - deploy variables: - IRRLICHT_TAG: "1.9.0mt4" + IRRLICHT_TAG: "1.9.0mt5" MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git" CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index bf5c9a0f2..e0c431711 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -45,7 +45,7 @@ done echo "The compiler runtime DLLs could not be found, they might be missing in the final package." # Get stuff -irrlicht_version=1.9.0mt4 +irrlicht_version=1.9.0mt5 ogg_version=1.3.5 openal_version=1.21.1 vorbis_version=1.3.7 @@ -83,7 +83,7 @@ download () { # this distinction should be gotten rid of next time cd $libdir -download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32-dw2.zip" irrlicht-$irrlicht_version.zip +download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version.zip download "http://minetest.kitsunemimi.pw/dw2/zlib-$zlib_version-win32.zip" download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win32.zip" download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip" diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index 30920cf53..e79397be4 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -45,7 +45,7 @@ done echo "The compiler runtime DLLs could not be found, they might be missing in the final package." # Get stuff -irrlicht_version=1.9.0mt4 +irrlicht_version=1.9.0mt5 ogg_version=1.3.5 openal_version=1.21.1 vorbis_version=1.3.7 diff --git a/util/ci/common.sh b/util/ci/common.sh index 2802a004a..e372dc682 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -11,7 +11,7 @@ install_linux_deps() { shift pkgs+=(libirrlicht-dev) else - wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt4/ubuntu-bionic.tar.gz" + wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt5/ubuntu-bionic.tar.gz" sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local fi -- cgit v1.2.3