gitlab: Cache config.cache in Clang builds.
This commit is contained in:
parent
20e3b7b859
commit
67f2da2a8d
2 changed files with 26 additions and 7 deletions
|
@ -9,5 +9,7 @@ set -Eeuxo pipefail
|
||||||
./tools/make_makefiles
|
./tools/make_makefiles
|
||||||
autoreconf -f
|
autoreconf -f
|
||||||
|
|
||||||
./configure -q --enable-archs=i386,x86_64,aarch64 --with-mingw=clang
|
cd build
|
||||||
|
../configure -q -C --enable-archs=i386,x86_64,aarch64 --with-mingw=clang
|
||||||
make -s -j$(nproc)
|
make -s -j$(nproc)
|
||||||
|
cd ..
|
||||||
|
|
|
@ -9,12 +9,6 @@
|
||||||
cache:
|
cache:
|
||||||
- paths:
|
- paths:
|
||||||
- ccache/
|
- ccache/
|
||||||
- key:
|
|
||||||
files:
|
|
||||||
- configure.ac
|
|
||||||
paths:
|
|
||||||
- build32/config.cache
|
|
||||||
- build64/config.cache
|
|
||||||
before_script:
|
before_script:
|
||||||
- export BASEDIR="$PWD"
|
- export BASEDIR="$PWD"
|
||||||
- export CCACHE_BASEDIR="$BASEDIR"
|
- export CCACHE_BASEDIR="$BASEDIR"
|
||||||
|
@ -34,7 +28,15 @@ build-linux:
|
||||||
expire_in: 1 day
|
expire_in: 1 day
|
||||||
paths:
|
paths:
|
||||||
- usr/local/
|
- usr/local/
|
||||||
|
cache:
|
||||||
|
- key:
|
||||||
|
files:
|
||||||
|
- configure.ac
|
||||||
|
paths:
|
||||||
|
- build32/config.cache
|
||||||
|
- build64/config.cache
|
||||||
script:
|
script:
|
||||||
|
- mkdir -p build32 build64
|
||||||
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux
|
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux
|
||||||
- git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA | sed -re '/\/tests\//!d; s@/tests/.*@/tests/Makefile.in@' |
|
- git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA | sed -re '/\/tests\//!d; s@/tests/.*@/tests/Makefile.in@' |
|
||||||
(xargs -r ls 2>/dev/null || true) | xargs -r sed '/TESTDLL/!d; s@.dll@@; s@.*= *@@' >usr/local/share/wine/winetest.args
|
(xargs -r ls 2>/dev/null || true) | xargs -r sed '/TESTDLL/!d; s@.dll@@; s@.*= *@@' >usr/local/share/wine/winetest.args
|
||||||
|
@ -43,7 +45,14 @@ build-clang:
|
||||||
extends: .wine-build
|
extends: .wine-build
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
||||||
|
cache:
|
||||||
|
- key:
|
||||||
|
files:
|
||||||
|
- configure.ac
|
||||||
|
paths:
|
||||||
|
- build/config.cache
|
||||||
script:
|
script:
|
||||||
|
- mkdir -p build
|
||||||
- ./tools/gitlab/build-clang
|
- ./tools/gitlab/build-clang
|
||||||
|
|
||||||
build-mac:
|
build-mac:
|
||||||
|
@ -52,12 +61,20 @@ build-mac:
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
||||||
tags:
|
tags:
|
||||||
- mac
|
- mac
|
||||||
|
cache:
|
||||||
|
- key:
|
||||||
|
files:
|
||||||
|
- configure.ac
|
||||||
|
paths:
|
||||||
|
- build32/config.cache
|
||||||
|
- build64/config.cache
|
||||||
artifacts:
|
artifacts:
|
||||||
when: on_failure
|
when: on_failure
|
||||||
paths:
|
paths:
|
||||||
- build64/config.log
|
- build64/config.log
|
||||||
- build32/config.log
|
- build32/config.log
|
||||||
script:
|
script:
|
||||||
|
- mkdir -p build32 build64
|
||||||
- export PATH="/usr/local/opt/ccache/libexec:$PATH"
|
- export PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||||
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac
|
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue