Skip to content

Commit 80d4264

Browse files
committed
ci: use submodules for freetype
1 parent ed598c3 commit 80d4264

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ jobs:
7373
run: |
7474
set -x
7575
sudo apt-get update
76-
sudo apt-get -y -q --no-install-recommends install zlib1g-dev libncursesw5-dev libgeoip-dev nettle-dev libgmp-dev libcurl4-gnutls-dev libsdl2-dev libogg-dev libvorbis-dev libopusfile-dev libwebp-dev libjpeg8-dev libpng-dev libfreetype6-dev libglew-dev libopenal-dev ninja-build
76+
sudo apt-get -y -q --no-install-recommends install zlib1g-dev libncursesw5-dev libgeoip-dev nettle-dev libgmp-dev libcurl4-gnutls-dev libsdl2-dev libogg-dev libvorbis-dev libopusfile-dev libwebp-dev libjpeg8-dev libpng-dev libglew-dev libopenal-dev ninja-build
7777
git submodule update --init --recursive
7878
7979
curl -sS https://gitlab.com/illwieckz/git-checkout-modules/raw/master/git-checkout-modules -o ~/git-checkout-modules
8080
bash ~/git-checkout-modules --update --sub-ref="${GITHUB_HEAD_REF}:has=/sync$" --print
8181
8282
export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"
83-
cmake -S. -Bbuild -GNinja -DBUILD_CLIENT=ON -DBUILD_TTY_CLIENT=ON -DBUILD_SERVER=ON -DBUILD_DUMMY_APP=ON
83+
cmake -S. -Bbuild -GNinja -DBUILD_CLIENT=ON -DBUILD_TTY_CLIENT=ON -DBUILD_SERVER=ON -DBUILD_DUMMY_APP=ON -DPREFER_EXTERNAL_LIBS=OFF
8484
cmake --build build
8585
8686
- name: Perform CodeQL Analysis

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- bash: |
5454
set -e
5555
cmake --version
56-
cmake -Wdev -Wdeprecated -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -DCMAKE_BUILD_TYPE=Release -DBUILD_DUMMY_APP=1 -DBUILD_TESTS=1 -H. -Bbuild
56+
cmake -Wdev -Wdeprecated -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -DCMAKE_BUILD_TYPE=Release -DBUILD_DUMMY_APP=1 -DBUILD_TESTS=1 -DPREFER_EXTERNAL_LIBS=OFF -H. -Bbuild
5757
cmake --build build -- -j`sysctl -n hw.logicalcpu`
5858
displayName: 'Build'
5959
- bash: |
@@ -117,13 +117,13 @@ jobs:
117117
- bash: |
118118
set -e
119119
sudo apt-get update
120-
sudo apt-get -y -q --no-install-recommends install zlib1g-dev libncursesw5-dev libgeoip-dev nettle-dev libgmp-dev libcurl4-gnutls-dev libsdl2-dev libogg-dev libvorbis-dev libopusfile-dev libwebp-dev libjpeg8-dev libpng-dev libfreetype6-dev libglew-dev libopenal-dev liblua5.2-dev ninja-build $(EXTRA_PACKAGES)
120+
sudo apt-get -y -q --no-install-recommends install zlib1g-dev libncursesw5-dev libgeoip-dev nettle-dev libgmp-dev libcurl4-gnutls-dev libsdl2-dev libogg-dev libvorbis-dev libopusfile-dev libwebp-dev libjpeg8-dev libpng-dev libglew-dev libopenal-dev liblua5.2-dev ninja-build $(EXTRA_PACKAGES)
121121
$(EXTRA_INSTALLS)
122122
displayName: 'Install deps'
123123
- bash: |
124124
set -e
125125
cmake --version
126-
cmake -G "Ninja" -Wdev -Wdeprecated -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -DBUILD_DUMMY_APP=1 -DBUILD_TESTS=1 -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -H. -Bbuild
126+
cmake -G "Ninja" -Wdev -Wdeprecated -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) -DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DUSE_PRECOMPILED_HEADER=0 -DUSE_WERROR=1 -DBE_VERBOSE=1 -DBUILD_DUMMY_APP=1 -DBUILD_TESTS=1 -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) PREFER_EXTERNAL_LIBS=OFF -DPREFER_EXTERNAL_LIBS=OFF -H. -Bbuild
127127
cmake --build build -- -j`nproc`
128128
displayName: 'Build'
129129
- bash: |

0 commit comments

Comments
 (0)