mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Have Android CI also use latest ccache to fix issues with cmake.

Browse Source
This commit is contained in:
psi29a 2022-01-31 07:57:08 +00:00
parent 5b641a61d2
commit 010dc90d42
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -68,7 +68,7 @@ Coverity:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
before_script: before_script:
- CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic coverity - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
- curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN
- tar xfz /tmp/cov-analysis-linux64.tgz - tar xfz /tmp/cov-analysis-linux64.tgz
script: script:
@ -181,9 +181,9 @@ Ubuntu_Static_Deps:
cache: cache:
key: Ubuntu_Static_Deps.V1 key: Ubuntu_Static_Deps.V1
paths: paths:
- apt-cache/ - apt-cache/
- ccache/ - ccache/
- build/extern/fetched/ - build/extern/fetched/
before_script: before_script:
- CI/install_debian_deps.sh clang openmw-deps openmw-deps-static - CI/install_debian_deps.sh clang openmw-deps openmw-deps-static
variables: variables:
@ -555,15 +555,13 @@ Ubuntu_AndroidNDK_arm64-v8a:
variables: variables:
CCACHE_SIZE: 3G CCACHE_SIZE: 3G
cache: cache:
key: Ubuntu__Focal_AndroidNDK_r22b_arm64-v8a.v1 key: Ubuntu__Focal_AndroidNDK_r22b_arm64-v8a.v2
paths: paths:
- apt-cache/ - apt-cache/
- ccache/ - ccache/
- build/extern/fetched/ - build/extern/fetched/
before_script: before_script:
- export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR - CI/install_debian_deps.sh gcc
- apt-get update -yq
- apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential
stage: build stage: build
script: script:
- export CCACHE_BASEDIR="`pwd`" - export CCACHE_BASEDIR="`pwd`"

10
CI/install_debian_deps.sh
View File

@ -9,13 +9,11 @@ print_help() {
} }
declare -rA GROUPED_DEPS=( declare -rA GROUPED_DEPS=(
[gcc]="binutils gcc g++ libc-dev" [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config"
[clang]="binutils clang" [clang]="binutils clang make cmake ccache curl unzip git pkg-config"
# Common dependencies for building OpenMW. # Common dependencies for building OpenMW.
[openmw-deps]=" [openmw-deps]="
make cmake ccache git pkg-config
libboost-filesystem-dev libboost-program-options-dev libboost-filesystem-dev libboost-program-options-dev
libboost-system-dev libboost-iostreams-dev libboost-system-dev libboost-iostreams-dev
@ -27,7 +25,6 @@ declare -rA GROUPED_DEPS=(
# These dependencies can alternatively be built and linked statically. # These dependencies can alternatively be built and linked statically.
[openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev libsqlite3-dev" [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev libsqlite3-dev"
[coverity]="curl"
[clang-tidy]="clang-tidy" [clang-tidy]="clang-tidy"
# Pre-requisites for building MyGUI and OSG for static linking. # Pre-requisites for building MyGUI and OSG for static linking.
@ -40,8 +37,7 @@ declare -rA GROUPED_DEPS=(
# * JPEG: libjpeg-dev # * JPEG: libjpeg-dev
# * PNG: libpng-dev # * PNG: libpng-dev
[openmw-deps-static]=" [openmw-deps-static]="
make cmake libcollada-dom-dev libfreetype6-dev libjpeg-dev libpng-dev
ccache curl unzip libcollada-dom-dev libfreetype6-dev libjpeg-dev libpng-dev
libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
" "
) )