summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/android.yml6
-rw-r--r--.github/workflows/build.yml31
-rw-r--r--.github/workflows/cpp_lint.yml14
-rw-r--r--.github/workflows/lua.yml11
-rw-r--r--.github/workflows/macos.yml4
-rw-r--r--README.md1
-rw-r--r--util/ci/common.sh3
7 files changed, 33 insertions, 37 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 12:28:34 +0000