summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rühsen <tim.ruehsen@gmx.de>2019-01-03 16:36:17 +0100
committerTim Rühsen <tim.ruehsen@gmx.de>2019-01-04 17:24:07 +0100
commit903ba05b6d98128820e031080828f10682586812 (patch)
tree84c10d99b08f7e985607dc40c834b1fd343da412
parentb978a25de5ef06754bf94bdfb2e6442b7fb6f1fa (diff)
downloadgnutls-903ba05b6d98128820e031080828f10682586812.tar.gz
Unroll MinGW CI runner commandstmp-unroll-ci-commands
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
-rw-r--r--.gitlab-ci.yml31
1 files changed, 18 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ba9f7eb52..6a7652ddeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -261,8 +261,9 @@ MinGW32.DLLs:
echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
- ./bootstrap
- export CC="ccache i686-w64-mingw32-gcc"
- - dash ./configure --disable-gcc-warnings --host=i686-w64-mingw32 --target=i686-w64-mingw32 --cache-file cache/config.cache --with-included-libtasn1 --disable-nls --disable-guile --with-included-unistring --enable-local-libopts --disable-non-suiteb-curves --disable-full-test-suite --disable-doc &&
- mingw32-make -j$(nproc) && mingw32-make -C tests check -j$(nproc)
+ - dash ./configure --disable-gcc-warnings --host=i686-w64-mingw32 --target=i686-w64-mingw32 --cache-file cache/config.cache --with-included-libtasn1 --disable-nls --disable-guile --with-included-unistring --enable-local-libopts --disable-non-suiteb-curves --disable-full-test-suite --disable-doc
+ - mingw32-make -j$(nproc)
+ - mingw32-make -C tests check -j$(nproc)
# Combine generated apps and DLLs.
#libwinpthread is required by libgcc
#libffi is required by libp11-kit
@@ -299,8 +300,9 @@ MinGW64.DLLs:
echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
- ./bootstrap
- export CC="ccache x86_64-w64-mingw32-gcc"
- - dash ./configure --disable-gcc-warnings --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 --cache-file cache/config.cache --with-included-libtasn1 --disable-guile --disable-nls --with-included-unistring --enable-local-libopts --disable-non-suiteb-curves --disable-full-test-suite --disable-doc &&
- mingw64-make -j$(nproc) && mingw64-make -C tests check -j$(nproc)
+ - dash ./configure --disable-gcc-warnings --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 --cache-file cache/config.cache --with-included-libtasn1 --disable-guile --disable-nls --with-included-unistring --enable-local-libopts --disable-non-suiteb-curves --disable-full-test-suite --disable-doc
+ - mingw64-make -j$(nproc)
+ - mingw64-make -C tests check -j$(nproc)
# Combine generated apps and DLLs.
#libwinpthread is required by libgcc
#libffi is required by libp11-kit
@@ -337,9 +339,10 @@ MinGW64:
- export CC="ccache x86_64-w64-mingw32-gcc"
- mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &&
echo ':DOSWin:M::MZ::/usr/bin/wine64:' > /proc/sys/fs/binfmt_misc/register &&
- mkdir -p build && cd build &&
- ../configure --disable-gcc-warnings --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 --cache-file ../cache/config.cache --with-included-libtasn1 --disable-guile --disable-nls --with-included-unistring --enable-local-libopts --disable-full-test-suite --disable-non-suiteb-curves --disable-doc &&
- mingw64-make -j$(nproc) && mingw64-make -C tests check -j$(nproc)
+ mkdir -p build && cd build
+ - dash ../configure --disable-gcc-warnings --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 --cache-file ../cache/config.cache --with-included-libtasn1 --disable-guile --disable-nls --with-included-unistring --enable-local-libopts --disable-full-test-suite --disable-non-suiteb-curves --disable-doc
+ - mingw64-make -j$(nproc)
+ - mingw64-make -C tests check -j$(nproc)
- cd ..
tags:
- shared
@@ -363,9 +366,10 @@ MinGW32:
- export CC="ccache i686-w64-mingw32-gcc"
- mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc &&
echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register &&
- mkdir -p build && cd build &&
- dash ../configure --disable-gcc-warnings --host=i686-w64-mingw32 --target=i686-w64-mingw32 --cache-file ../cache/config.cache --with-included-libtasn1 --disable-guile --disable-nls --with-included-unistring --enable-local-libopts --disable-full-test-suite --disable-non-suiteb-curves --disable-doc &&
- mingw32-make -j$(nproc) && mingw32-make -C tests check -j$(nproc)
+ mkdir -p build && cd build
+ - dash ../configure --disable-gcc-warnings --host=i686-w64-mingw32 --target=i686-w64-mingw32 --cache-file ../cache/config.cache --with-included-libtasn1 --disable-guile --disable-nls --with-included-unistring --enable-local-libopts --disable-full-test-suite --disable-non-suiteb-curves --disable-doc
+ - mingw32-make -j$(nproc)
+ - mingw32-make -C tests check -j$(nproc)
- cd ..
tags:
- shared
@@ -446,9 +450,10 @@ Debian.x86_64:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
script:
- ./bootstrap
- - mkdir -p build && cd build &&
- dash ../configure --disable-gcc-warnings --cache-file ../cache/config.cache --disable-doc --disable-guile --disable-full-test-suite LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now' &&
- make -j$(nproc) && make check -j$(nproc)
+ - mkdir -p build && cd build
+ - dash ../configure --disable-gcc-warnings --cache-file ../cache/config.cache --disable-doc --disable-guile --disable-full-test-suite LDFLAGS='-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now'
+ - make -j$(nproc)
+ - make check -j$(nproc)
- cd ..
tags:
- shared