diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-01-04 15:07:04 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-01-21 21:16:45 +0400 |
| commit | f8067a07c372989acb260926706cb793aedfd276 (patch) | |
| tree | f0a254ba61f9a083f7071aa305637b8b1fe41d3a /.gitlab-ci.yml | |
| parent | e0deb95b31de0ebf2f09bdd3a0a9289dbb283d6d (diff) | |
| download | dbus-f8067a07c372989acb260926706cb793aedfd276.tar.gz | |
gitlab-ci: move "before_script" and "cache" to .debian-build
As we are introducing Windows builds next, move out Unix-specific
job definitions to the base job.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 976d9ff4..bdd3e2e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,20 +25,6 @@ image: debian:buster-slim stages: - build -before_script: - - ./tools/ci-install.sh - - mkdir -p .ccache - - export CCACHE_BASEDIR="$(pwd)" - - export CCACHE_DIR="$CCACHE_BASEDIR/.ccache" - # Debian's ccache package creates symlinks here for all supported - # compilers - - export PATH="/usr/lib/ccache:$PATH" - -cache: - key: ${CI_JOB_NAME} - paths: - - .ccache/ - variables: ci_in_docker: "yes" ci_local_packages: "yes" @@ -50,6 +36,18 @@ variables: .debian-build: stage: build image: "debian:buster-slim" + cache: + key: ${CI_JOB_NAME} + paths: + - .ccache/ + before_script: + - ./tools/ci-install.sh + - mkdir -p .ccache + - export CCACHE_BASEDIR="$(pwd)" + - export CCACHE_DIR="$CCACHE_BASEDIR/.ccache" + # Debian's ccache package creates symlinks here for all supported + # compilers + - export PATH="/usr/lib/ccache:$PATH" script: - chown -R user . - runuser -u user ./tools/ci-build.sh |