diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-11-30 17:23:54 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-11-30 17:23:54 +0100 |
| commit | 634016f23c31e7b527bc293552b9d54f39c8473f (patch) | |
| tree | d53a6a3fbfabb131626e8d9333c5dfd525b8b21c | |
| parent | 65e3753addcf46aa8eb45c608a5a02b9043c9578 (diff) | |
| download | gnutls-tmp-wine-update.tar.gz | |
.gitlab-ci.yml: do not require mount of /proc/sys/fs/binfmt_misc to succeedtmp-wine-update
In some CI systems, it is not possible to write to this filesystem, and
they already have the wine executable registered. In the case we cannot
write proceed to running the check and hope for the best.
lease enter the commit message for your changes. Lines starting
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2275c96985..ad3b997353 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -193,7 +193,7 @@ Fedora/x86_64/asan: MinGW32/DLLs: script: - dnf install -y wine.i686 mingw32-p11-kit mingw32-nettle mingw32-libtasn1 mingw32-gcc mingw32-gmp mingw32-libidn util-linux - - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc + - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc || true - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register || true - make autoreconf && rm -f tests/suite/mini-eagain2.c && mingw32-configure --with-included-libtasn1 --disable-nls --with-included-unistring --enable-local-libopts --disable-non-suiteb-curves --disable-doc --disable-valgrind-tests && @@ -229,7 +229,7 @@ MinGW32/DLLs: MinGW64/DLLs: script: - dnf install -y wine mingw64-nettle mingw64-libtasn1 mingw64-p11-kit mingw64-gcc mingw64-gmp mingw64-libidn util-linux - - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc + - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc || true - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register || true - make autoreconf && rm -f tests/suite/mini-eagain2.c && mingw64-configure --with-included-libtasn1 --disable-nls --with-included-unistring --enable-local-libopts --disable-non-suiteb-curves --disable-doc --disable-valgrind-tests && @@ -265,7 +265,7 @@ MinGW64/DLLs: MinGW64: script: - dnf install -y wine mingw64-nettle mingw64-p11-kit mingw64-libtasn1 mingw64-gcc mingw64-gmp mingw64-libidn util-linux mingw64-cmocka - - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc + - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc || true - echo ':DOSWin:M::MZ::/usr/bin/wine64:' > /proc/sys/fs/binfmt_misc/register || true - make autoreconf && rm -f tests/suite/mini-eagain2.c && mkdir -p build && cd build && mingw64-configure --with-included-libtasn1 --with-included-unistring --enable-local-libopts --without-p11-kit --disable-non-suiteb-curves --disable-doc --disable-valgrind-tests && @@ -285,7 +285,7 @@ MinGW64: MinGW32: script: - dnf install -y wine.i686 mingw32-p11-kit mingw32-nettle mingw32-libtasn1 mingw32-gcc mingw32-gmp mingw32-libidn util-linux mingw32-cmocka - - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc + - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc || true - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register || true - make autoreconf && rm -f tests/suite/mini-eagain2.c && mkdir -p build && cd build && mingw32-configure --with-included-libtasn1 --with-included-unistring --enable-local-libopts --without-p11-kit --disable-non-suiteb-curves --disable-doc --disable-valgrind-tests && |