Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

CI: fix build

Browse Source
This commit is contained in:
sfan5 2020-12-23 21:24:27 +01:00
parent d2bbf13dfe
commit 2bdf4955c8
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install g++-6 gcc-6 -qyy
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps install_linux_deps g++-6
- name: Build - name: Build
run: | run: |
@ -55,9 +54,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install g++-8 gcc-8 -qyy
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps install_linux_deps g++-8
- name: Build - name: Build
run: | run: |
@ -77,9 +75,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install clang-3.9 -qyy
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps install_linux_deps clang-3.9
- name: Build - name: Build
run: | run: |
@ -99,11 +96,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install clang-9 valgrind -qyy
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps install_linux_deps clang-9 valgrind libluajit-5.1-dev
env:
WITH_LUAJIT: 1
- name: Build - name: Build
run: | run: |
@ -111,6 +105,7 @@ jobs:
env: env:
CC: clang-9 CC: clang-9
CXX: clang++-9 CXX: clang++-9
CMAKE_FLAGS: "-DREQUIRE_LUAJIT=1"
- name: Test - name: Test
run: | run: |
@ -128,9 +123,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install clang-9 -qyy
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps install_linux_deps clang-9
- name: Build prometheus-cpp - name: Build prometheus-cpp
run: | run: |
@ -156,9 +150,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install clang-9 -qyy
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps install_linux_deps clang-9
- name: Build - name: Build
run: | run: |
@ -188,7 +181,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install compiler - name: Install compiler
run: | run: |
sudo apt-get install gettext -qyy sudo apt-get update -q && sudo apt-get install gettext -qyy
wget http://minetest.kitsunemimi.pw/mingw-w64-i686_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz wget http://minetest.kitsunemimi.pw/mingw-w64-i686_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
sudo tar -xaf mingw.tar.xz -C /usr sudo tar -xaf mingw.tar.xz -C /usr
@ -206,7 +199,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install compiler - name: Install compiler
run: | run: |
sudo apt-get install gettext -qyy sudo apt-get update -q && sudo apt-get install gettext -qyy
wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz wget http://minetest.kitsunemimi.pw/mingw-w64-x86_64_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
sudo tar -xaf mingw.tar.xz -C /usr sudo tar -xaf mingw.tar.xz -C /usr

6
util/ci/common.sh
View File

@ -7,13 +7,9 @@ install_linux_deps() {
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \ libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
gettext libpq-dev postgresql-server-dev-all libleveldb-dev \ gettext libpq-dev postgresql-server-dev-all libleveldb-dev \
libcurl4-openssl-dev) libcurl4-openssl-dev)
# for better coverage, build some jobs with luajit
if [ -n "$WITH_LUAJIT" ]; then
pkgs+=(libluajit-5.1-dev)
fi
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[@]} "$@"
} }
# Mac OSX build only # Mac OSX build only