BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Sort out some issues with our CI setup

Browse Source 
* 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
This commit is contained in:
sfan5 2022-05-01 14:44:48 +02:00
parent 47cf257c40
commit e108954633
7 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/android.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
@ -31,12 +31,12 @@ jobs:
- name: Build with Gradle - name: Build with Gradle
run: cd android; ./gradlew assemblerelease run: cd android; ./gradlew assemblerelease
- name: Save armeabi artifact - name: Save armeabi artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: Minetest-armeabi-v7a.apk name: Minetest-armeabi-v7a.apk
path: android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk path: android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
- name: Save arm64 artifact - name: Save arm64 artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: Minetest-arm64-v8a.apk name: Minetest-arm64-v8a.apk
path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk

31
.github/workflows/build.yml vendored
View File

@ -34,7 +34,7 @@ jobs:
gcc_5: gcc_5:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
source ./util/ci/common.sh source ./util/ci/common.sh
@ -55,7 +55,7 @@ jobs:
gcc_10: gcc_10:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
source ./util/ci/common.sh source ./util/ci/common.sh
@ -76,7 +76,7 @@ jobs:
clang_3_9: clang_3_9:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
source ./util/ci/common.sh source ./util/ci/common.sh
@ -101,7 +101,7 @@ jobs:
clang_10: clang_10:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
source ./util/ci/common.sh source ./util/ci/common.sh
@ -126,9 +126,9 @@ jobs:
# Build with prometheus-cpp (server-only) # Build with prometheus-cpp (server-only)
clang_9_prometheus: clang_9_prometheus:
name: "clang_9 (PROMETHEUS=1)" name: "clang_9 (PROMETHEUS=1)"
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
source ./util/ci/common.sh source ./util/ci/common.sh
@ -152,9 +152,9 @@ jobs:
docker: docker:
name: "Docker image" name: "Docker image"
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Build docker image - name: Build docker image
run: | run: |
docker build . -t minetest:latest docker build . -t minetest:latest
@ -164,10 +164,10 @@ jobs:
name: "MinGW cross-compiler (32-bit)" name: "MinGW cross-compiler (32-bit)"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install compiler - name: Install compiler
run: | 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 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 sudo tar -xaf mingw.tar.xz -C /usr
@ -182,10 +182,10 @@ jobs:
name: "MinGW cross-compiler (64-bit)" name: "MinGW cross-compiler (64-bit)"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install compiler - name: Install compiler
run: | 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 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 sudo tar -xaf mingw.tar.xz -C /usr
@ -223,10 +223,9 @@ jobs:
# Enable it, when working on the installer. # Enable it, when working on the installer.
steps: steps:
- name: Checkout - uses: actions/checkout@v3
uses: actions/checkout@v3
- name: Checkout IrrlichtMT - name: Checkout IrrlichtMt
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
repository: minetest/irrlicht repository: minetest/irrlicht
@ -269,7 +268,7 @@ jobs:
- name: Package Clean - name: Package Clean
run: rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages run: rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v3
with: with:
name: msvc-${{ matrix.config.arch }}-${{ matrix.type }} name: msvc-${{ matrix.config.arch }}-${{ matrix.type }}
path: .\Package\ path: .\Package\

14
.github/workflows/cpp_lint.yml vendored
View File

@ -26,12 +26,13 @@ on:
jobs: jobs:
# clang_format: # clang_format:
# runs-on: ubuntu-18.04 # runs-on: ubuntu-20.04
# steps: # steps:
# - uses: actions/checkout@v2 # - uses: actions/checkout@v3
# - name: Install clang-format # - name: Install clang-format
# run: | # 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 # - name: Run clang-format
# run: | # run: |
@ -41,14 +42,13 @@ jobs:
# CLANG_FORMAT: clang-format-9 # CLANG_FORMAT: clang-format-9
clang_tidy: clang_tidy:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install clang-tidy-9 -qyy
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps install_linux_deps clang-tidy-9
- name: Run clang-tidy - name: Run clang-tidy
run: | run: |

11
.github/workflows/lua.yml vendored
View File

@ -19,11 +19,11 @@ jobs:
name: "Compile and run multiplayer tests" name: "Compile and run multiplayer tests"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps clang-10 gdb install_linux_deps clang-10 gdb libluajit-5.1-dev
- name: Build - name: Build
run: | run: |
@ -31,6 +31,7 @@ jobs:
env: env:
CC: clang-10 CC: clang-10
CXX: clang++-10 CXX: clang++-10
CMAKE_FLAGS: "-DENABLE_GETTEXT=0 -DBUILD_SERVER=0"
- name: Integration test + devtest - name: Integration test + devtest
run: | run: |
@ -38,12 +39,12 @@ jobs:
luacheck: luacheck:
name: "Builtin Luacheck and Unit Tests" name: "Builtin Luacheck and Unit Tests"
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install luarocks - name: Install luarocks
run: | run: |
sudo apt-get install luarocks -qyy sudo apt-get update && sudo apt-get install -y luarocks
- name: Install luarocks tools - name: Install luarocks tools
run: | run: |

4
.github/workflows/macos.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
build: build:
runs-on: macos-10.15 runs-on: macos-10.15
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
pkgs=(cmake freetype gettext gmp hiredis jpeg jsoncpp leveldb libogg libpng libvorbis luajit zstd) pkgs=(cmake freetype gettext gmp hiredis jpeg jsoncpp leveldb libogg libpng libvorbis luajit zstd)
@ -60,7 +60,7 @@ jobs:
run: | run: |
./build/macos/minetest.app/Contents/MacOS/minetest --run-unittests ./build/macos/minetest.app/Contents/MacOS/minetest --run-unittests
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
with: with:
name: minetest-macos name: minetest-macos
path: ./build/macos/ path: ./build/macos/

1
README.md
View File

@ -305,7 +305,6 @@ Library specific options:
VORBIS_DLL - Only if building with sound on Windows; paths to vorbis DLLs 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_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 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_DLL - Only on Windows; path to zlib1.dll
ZLIB_INCLUDE_DIR - Directory that contains zlib.h ZLIB_INCLUDE_DIR - Directory that contains zlib.h
ZLIB_LIBRARY - Path to libz.a/libz.so/zlib.lib ZLIB_LIBRARY - Path to libz.a/libz.so/zlib.lib

3
util/ci/common.sh
View File

@ -17,9 +17,6 @@ install_linux_deps() {
sudo apt-get update sudo apt-get update
sudo apt-get install -y --no-install-recommends ${pkgs[@]} "$@" 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 # Mac OSX build only