From: Daniel Lenski <dlenski@gmail.com>
Date: Fri, 26 Mar 2021 17:56:23 +0000 (-0700)
Subject: CI: update artifact paths for MinGW* builds
X-Git-Tag: v8.20~346
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f656c850451c03a28d611abd26f4b1fe3aaef97d;p=users%2Fdwmw2%2Fopenconnect.git

CI: update artifact paths for MinGW* builds

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03a3c658..80c5f96e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -367,7 +367,6 @@ MinGW32/GnuTLS:
 # These tests seem to fail due to wine failing to start; setting as XFAIL
 # since these never run before this patch set.
   - make VERBOSE=1 -j4 check XFAIL_TESTS="sigterm dtls-psk"
-  - ./make-windows-installer.sh
   tags:
   - shared
   except:
@@ -378,8 +377,7 @@ MinGW32/GnuTLS:
     when: always
     paths:
       - tests/*.log
-      - nsis/openconnect.nsi
-      - nsis/openconnect-installer.exe
+      - openconnect-installer.exe
 
 MinGW32/OpenSSL:
   script:
@@ -391,7 +389,6 @@ MinGW32/OpenSSL:
 # These tests seem to fail due to wine failing to start; setting as XFAIL
 # since these never run before this patch set.
   - make VERBOSE=1 -j4 check XFAIL_TESTS="sigterm dtls-psk"
-  - ./make-windows-installer.sh
   tags:
   - shared
   except:
@@ -402,8 +399,7 @@ MinGW32/OpenSSL:
     when: always
     paths:
       - tests/*.log
-      - nsis/openconnect.nsi
-      - nsis/openconnect-installer.exe
+      - openconnect-installer.exe
 
 MinGW64/GnuTLS:
   script:
@@ -423,9 +419,10 @@ MinGW64/GnuTLS:
   - schedules
   artifacts:
     expire_in: 1 week
-    when: on_failure
+    when: always
     paths:
       - tests/*.log
+      - openconnect-installer.exe
 
 MinGW64/OpenSSL:
   script:
@@ -445,9 +442,10 @@ MinGW64/OpenSSL:
   - schedules
   artifacts:
     expire_in: 1 week
-    when: on_failure
+    when: always
     paths:
       - tests/*.log
+      - openconnect-installer.exe
 
 static-analyzer/GnuTLS/Fedora:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:buildenv-fedora
@@ -463,9 +461,10 @@ static-analyzer/GnuTLS/Fedora:
   - schedules
   artifacts:
     expire_in: 1 week
-    when: on_failure
+    when: always
     paths:
-      - scan-build-src/*
+      - tests/*.log
+      - openconnect-installer.exe
 
 static-analyzer/OpenSSL/Fedora:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:buildenv-fedora