Skip to content
Snippets Groups Projects
Commit 8251bf3b authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/smcv/ci' into 'master'

CI: Speed up build:devel step

See merge request !323
parents 3fd32248 3df34f76
No related branches found
No related tags found
1 merge request!323CI: Speed up build:devel step
...@@ -117,20 +117,43 @@ build:devel: ...@@ -117,20 +117,43 @@ build:devel:
- | - |
set -eux set -eux
apt-get -y --no-install-recommends install \
clang \
clang-tools \
${NULL+}
mkdir -p -m700 "${STEAM_CI_TMPDIR}" mkdir -p -m700 "${STEAM_CI_TMPDIR}"
export TMPDIR="${STEAM_CI_TMPDIR}" export TMPDIR="${STEAM_CI_TMPDIR}"
mkdir -p _build mkdir -p _build
meson --werror -Dman=true _build/devel meson \
-Dman=true \
--werror \
_build/devel
ninja -C _build/devel ninja -C _build/devel
ninja -C _build/devel install ninja -C _build/devel install
meson test --verbose -C _build/devel meson test --verbose -C _build/devel
artifacts:
paths:
- _build/devel/meson-logs/*.txt
when: always
build:clang:
stage: build
tags:
- docker
- linux
rules:
- if: '$DEVEL_DOCKER_REGISTRY != "" && $DEVEL_DOCKER_IMAGE != ""'
image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}"
script:
- |
set -eux
apt-get -y --no-install-recommends install \
clang \
clang-tools \
${NULL+}
mkdir -p -m700 "${STEAM_CI_TMPDIR}"
export TMPDIR="${STEAM_CI_TMPDIR}"
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
...@@ -140,13 +163,11 @@ build:devel: ...@@ -140,13 +163,11 @@ build:devel:
--werror \ --werror \
_build/clang-asan _build/clang-asan
ninja -C _build/clang-asan ninja -C _build/clang-asan
ninja -C _build/clang-asan scan-build
ninja -C _build/clang-asan install ninja -C _build/clang-asan install
meson test --verbose -C _build/clang-asan meson test --verbose -C _build/clang-asan
artifacts: artifacts:
paths: paths:
- _build/devel/meson-logs/*.txt
- _build/clang-asan/meson-logs/*.txt - _build/clang-asan/meson-logs/*.txt
when: always when: always
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment