Commit a8d1b75e authored by Vivien Kraus's avatar Vivien Kraus
Browse files

Merge branch '182-build-pipelines-use-gitlab-ci-cache' into 'develop'

Resolve "Build pipelines: use Gitlab CI cache"

Closes #182

See merge request !188
parents d527076e 97528fd1
Pipeline #333246 passed with stages
in 81 minutes and 41 seconds
...@@ -13,6 +13,15 @@ ...@@ -13,6 +13,15 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
variables:
APT_CACHE: "$CI_PROJECT_DIR/cache/apt"
DNF_CACHE: "$CI_PROJECT_DIR/cache/dnf"
cache:
key: tarot
paths:
- cache
image: debian image: debian
stages: stages:
...@@ -21,7 +30,6 @@ stages: ...@@ -21,7 +30,6 @@ stages:
- manual - manual
dist: dist:
image: tarotbis/dist
stage: dist stage: dist
script: "./ci/dist.sh" script: "./ci/dist.sh"
artifacts: artifacts:
...@@ -30,12 +38,11 @@ dist: ...@@ -30,12 +38,11 @@ dist:
expire_in: 1 week expire_in: 1 week
check: check:
image: tarotbis/check
stage: check stage: check
script: "./ci/check.sh" script: "./ci/check.sh"
mingw: mingw:
image: tarotbis/mingw image: fedora
stage: check stage: check
script: "./ci/mingw.sh" script: "./ci/mingw.sh"
artifacts: artifacts:
...@@ -44,7 +51,6 @@ mingw: ...@@ -44,7 +51,6 @@ mingw:
expire_in: 1 week expire_in: 1 week
deb: deb:
image: tarotbis/deb
stage: check stage: check
script: "./ci/deb.sh" script: "./ci/deb.sh"
artifacts: artifacts:
......
...@@ -14,13 +14,16 @@ ...@@ -14,13 +14,16 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
echo "Dir::Cache::Archives $APT_CACHE;" > /etc/apt/apt.conf.d/75gitlabcicache.conf
mkdir -p $APT_CACHE || exit 1
apt-get update apt-get update
apt-get upgrade -y apt-get upgrade -y
apt-get install -y \ apt-get install -y \
build-essential \ build-essential \
guile-2.2-dev \ guile-2.2-dev \
frama-c \ frama-c-base \
libglib2.0-dev \ libglib2.0-dev \
make \
nettle-dev \ nettle-dev \
pkg-config \ pkg-config \
valgrind valgrind
......
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
echo "Dir::Cache::Archives $APT_CACHE;" > /etc/apt/apt.conf.d/75gitlabcicache.conf
mkdir -p $APT_CACHE || exit 1
apt-get update || exit 1 apt-get update || exit 1
apt-get upgrade -y || exit 1
apt-get install -y \ apt-get install -y \
build-essential \ build-essential \
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
# #
# Remove VALAFLAGS="--target-glib=2.50" # Remove VALAFLAGS="--target-glib=2.50"
echo "Dir::Cache::Archives $APT_CACHE;" > /etc/apt/apt.conf.d/75gitlabcicache.conf
mkdir -p $APT_CACHE || exit 1
apt-get update apt-get update
apt-get upgrade -y apt-get upgrade -y
apt-get install -y \ apt-get install -y \
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
(echo "keepcache=True" ; echo "cachedir=$DNF_CACHE") >> /etc/dnf/dnf.conf || exit 1
mkdir -p $DNF_CACHE || exit 1
dnf update -y || exit 1 dnf update -y || exit 1
cat > /etc/rpm/macros.image-language-conf <<EOF cat > /etc/rpm/macros.image-language-conf <<EOF
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
echo "Dir::Cache::Archives $APT_CACHE;" > /etc/apt/apt.conf.d/75gitlabcicache.conf
mkdir -p $APT_CACHE || exit 1
apt-get update apt-get update
apt-get upgrade -y apt-get upgrade -y
apt-get install -y \ apt-get install -y \
......
Markdown is supported
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