Commit 42444207 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Gitlab-CI: Handle ccache path correctly and sync upstream Salsa-CI changes

Salsa-CI changed the path names of .ccache and thus MariaDB builds stopped
working as the file size of the artifact directory with .ccache included
was way over limits. These changes put the .ccache directory in the correct
place and slims down the amount of total artifacts.
parent 0d034c2b
...@@ -7,8 +7,6 @@ include: ...@@ -7,8 +7,6 @@ include:
variables: variables:
DEB_BUILD_OPTIONS: "nocheck noautodbgsym" DEB_BUILD_OPTIONS: "nocheck noautodbgsym"
RELEASE: stretch RELEASE: stretch
CCACHE_TMP_DIR: ${CI_PROJECT_DIR}/../.ccache
CCACHE_WORK_DIR: ${WORKING_DIR}/.ccache
SALSA_CI_DISABLE_REPROTEST: 1 SALSA_CI_DISABLE_REPROTEST: 1
stages: stages:
...@@ -23,8 +21,11 @@ stages: ...@@ -23,8 +21,11 @@ stages:
build: build:
extends: .build-package extends: .build-package
script: script:
- apt-get update # salsa-ci-team/pipeline#104
- mkdir -p ${CCACHE_WORK_DIR} - rm -rf '$CI_PROJECT_DIR'
# salsa-ci-team/pipeline#107
- rm -rf ${CI_PROJECT_DIR}/debian/output/.ccache
- mkdir -p ${WORKING_DIR} ${CCACHE_WORK_DIR}
- mv ${CCACHE_WORK_DIR} ${CCACHE_TMP_DIR} - mv ${CCACHE_WORK_DIR} ${CCACHE_TMP_DIR}
- gbp pull --ignore-branch --pristine-tar --track-missing - gbp pull --ignore-branch --pristine-tar --track-missing
- | - |
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment