mirror of https://github.com/minetest/minetest.git
Merge 0c1445a4b3
into 7e4462e0ac
This commit is contained in:
commit
aea57dfd03
|
@ -38,6 +38,10 @@ jobs:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: ${{ github.job }}
|
||||||
- name: Install deps
|
- name: Install deps
|
||||||
run: |
|
run: |
|
||||||
source ./util/ci/common.sh
|
source ./util/ci/common.sh
|
||||||
|
@ -59,6 +63,10 @@ jobs:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: ${{ github.job }}
|
||||||
- name: Install deps
|
- name: Install deps
|
||||||
run: |
|
run: |
|
||||||
source ./util/ci/common.sh
|
source ./util/ci/common.sh
|
||||||
|
@ -83,6 +91,10 @@ jobs:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: ${{ github.job }}
|
||||||
- name: Install deps
|
- name: Install deps
|
||||||
run: |
|
run: |
|
||||||
source ./util/ci/common.sh
|
source ./util/ci/common.sh
|
||||||
|
@ -105,6 +117,10 @@ jobs:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: ${{ github.job }}
|
||||||
- name: Install deps
|
- name: Install deps
|
||||||
run: |
|
run: |
|
||||||
source ./util/ci/common.sh
|
source ./util/ci/common.sh
|
||||||
|
@ -131,6 +147,10 @@ jobs:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: ${{ github.job }}
|
||||||
- name: Install deps
|
- name: Install deps
|
||||||
run: |
|
run: |
|
||||||
source ./util/ci/common.sh
|
source ./util/ci/common.sh
|
||||||
|
|
|
@ -20,6 +20,11 @@ jobs:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: ${{ github.job }}
|
||||||
|
|
||||||
- name: Install deps
|
- name: Install deps
|
||||||
run: |
|
run: |
|
||||||
source ./util/ci/common.sh
|
source ./util/ci/common.sh
|
||||||
|
@ -44,6 +49,10 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: ${{ github.job }}
|
||||||
- uses: leafo/gh-actions-lua@v10
|
- uses: leafo/gh-actions-lua@v10
|
||||||
with:
|
with:
|
||||||
luaVersion: "5.1.5"
|
luaVersion: "5.1.5"
|
||||||
|
@ -51,6 +60,7 @@ jobs:
|
||||||
|
|
||||||
- name: Install LuaJIT
|
- name: Install LuaJIT
|
||||||
run: |
|
run: |
|
||||||
|
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
||||||
cd $HOME
|
cd $HOME
|
||||||
git clone https://github.com/LuaJIT/LuaJIT/
|
git clone https://github.com/LuaJIT/LuaJIT/
|
||||||
cd LuaJIT
|
cd LuaJIT
|
||||||
|
|
|
@ -62,6 +62,8 @@ cmake_args=(
|
||||||
-DENABLE_GETTEXT=1
|
-DENABLE_GETTEXT=1
|
||||||
-DENABLE_LEVELDB=1
|
-DENABLE_LEVELDB=1
|
||||||
)
|
)
|
||||||
|
# Use ccache if it is available
|
||||||
|
command -v ccache >/dev/null && cmake_args+=(-DCMAKE_{C,CXX}_COMPILER_LAUNCHER=ccache)
|
||||||
add_cmake_libs
|
add_cmake_libs
|
||||||
cmake -S $sourcedir -B build "${cmake_args[@]}"
|
cmake -S $sourcedir -B build "${cmake_args[@]}"
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,8 @@ cmake_args=(
|
||||||
-DENABLE_GETTEXT=1
|
-DENABLE_GETTEXT=1
|
||||||
-DENABLE_LEVELDB=1
|
-DENABLE_LEVELDB=1
|
||||||
)
|
)
|
||||||
|
# Use ccache if it is available
|
||||||
|
command -v ccache >/dev/null && cmake_args+=(-DCMAKE_{C,CXX}_COMPILER_LAUNCHER=ccache)
|
||||||
add_cmake_libs
|
add_cmake_libs
|
||||||
cmake -S $sourcedir -B build "${cmake_args[@]}"
|
cmake -S $sourcedir -B build "${cmake_args[@]}"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
|
|
||||||
|
# Use ccache if it is available
|
||||||
|
extra_args=()
|
||||||
|
command -v ccache >/dev/null && extra_args+=(-DCMAKE_{C,CXX}_COMPILER_LAUNCHER=ccache)
|
||||||
|
|
||||||
cmake -B build \
|
cmake -B build \
|
||||||
|
"${extra_args[@]}" \
|
||||||
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Debug} \
|
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Debug} \
|
||||||
-DENABLE_LTO=FALSE \
|
-DENABLE_LTO=FALSE \
|
||||||
-DRUN_IN_PLACE=TRUE \
|
-DRUN_IN_PLACE=TRUE \
|
||||||
|
|
|
@ -1,10 +1,15 @@
|
||||||
#! /bin/bash -eu
|
#! /bin/bash -eu
|
||||||
|
|
||||||
|
# Use ccache if it is available
|
||||||
|
extra_args=()
|
||||||
|
command -v ccache >/dev/null && extra_args+=(-DCMAKE_{C,CXX}_COMPILER_LAUNCHER=ccache)
|
||||||
|
|
||||||
cd /tmp
|
cd /tmp
|
||||||
git clone --recursive https://github.com/jupp0r/prometheus-cpp
|
git clone --recursive https://github.com/jupp0r/prometheus-cpp
|
||||||
mkdir prometheus-cpp/build
|
mkdir prometheus-cpp/build
|
||||||
cd prometheus-cpp/build
|
cd prometheus-cpp/build
|
||||||
cmake .. \
|
cmake .. \
|
||||||
|
"${extra_args[@]}" \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr/local \
|
-DCMAKE_INSTALL_PREFIX=/usr/local \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DENABLE_TESTING=0
|
-DENABLE_TESTING=0
|
||||||
|
|
Loading…
Reference in New Issue