From 12eaf0b8dd241b14f9de16a4aed6789a8cc5f802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 17 Oct 2019 15:53:41 +0200
Subject: [PATCH] CI: store Boost version in a variable
---
.gitlab-ci.yml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e36b909..35549246 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
variables:
TERM: linux
+ MINGW32_BOOST_VERSION: 1.71.0-1
+ MINGW64_BOOST_VERSION: 1.71.0-1
before_script:
- 'export REMOTE_PATH=https://www.dynare.org/preprocessor/$CI_COMMIT_SHORT_SHA'
@@ -46,9 +48,9 @@ build_windows_32:
stage: build
script:
- mkdir -p deps
- - cd deps && wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-boost-1.71.0-1-any.pkg.tar.xz
- - tar xf mingw-w64-i686-boost-1.71.0-1-any.pkg.tar.xz
- - rm mingw-w64-i686-boost-1.71.0-1-any.pkg.tar.xz && cd ..
+ - cd deps && wget http://repo.msys2.org/mingw/i686/mingw-w64-i686-boost-$MINGW32_BOOST_VERSION-any.pkg.tar.xz
+ - tar xf mingw-w64-i686-boost-$MINGW32_BOOST_VERSION-any.pkg.tar.xz
+ - rm mingw-w64-i686-boost-$MINGW32_BOOST_VERSION-any.pkg.tar.xz && cd ..
- autoreconf -si
- './configure --host=i686-w64-mingw32 --with-boost=$(pwd)/deps/mingw32/include LDFLAGS="-static -static-libgcc -static-libstdc++"'
- make -j$(nproc)
@@ -67,9 +69,9 @@ build_windows_64:
stage: build
script:
- mkdir -p deps
- - cd deps && wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-boost-1.71.0-1-any.pkg.tar.xz
- - tar xf mingw-w64-x86_64-boost-1.71.0-1-any.pkg.tar.xz
- - rm mingw-w64-x86_64-boost-1.71.0-1-any.pkg.tar.xz && cd ..
+ - cd deps && wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-boost-$MINGW64_BOOST_VERSION-any.pkg.tar.xz
+ - tar xf mingw-w64-x86_64-boost-$MINGW64_BOOST_VERSION-any.pkg.tar.xz
+ - rm mingw-w64-x86_64-boost-$MINGW64_BOOST_VERSION-any.pkg.tar.xz && cd ..
- autoreconf -si
- './configure --host=x86_64-w64-mingw32 --with-boost=$(pwd)/deps/mingw64/include LDFLAGS="-static -static-libgcc -static-libstdc++"'
- make -j$(nproc)
--
GitLab