From e95595205f1729d5c81924aaeadb5b8946eca3a5 Mon Sep 17 00:00:00 2001 From: felix Date: Wed, 10 Oct 2018 16:35:01 +0200 Subject: [PATCH 1/3] removed "rustup" & added new runner tag --- .gitlab-ci.yml | 2 ++ scripts/gitlab/build-windows.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80adaf45db0..f86084c9e83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,7 @@ build-windows: - sh scripts/gitlab/build-windows.sh tags: - rust-windows + - windows <<: *collect_artifacts publish-docker: @@ -162,6 +163,7 @@ test-windows: - sh scripts/gitlab/test-all.sh stable tags: - rust-windows + - windows test-beta: stage: optional diff --git a/scripts/gitlab/build-windows.sh b/scripts/gitlab/build-windows.sh index b0570b917dc..afd4c64a601 100755 --- a/scripts/gitlab/build-windows.sh +++ b/scripts/gitlab/build-windows.sh @@ -5,8 +5,6 @@ set -u # treat unset variables as error set INCLUDE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt" set LIB="C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64" -rustup default stable-x86_64-pc-windows-msvc - echo "__________Show ENVIROMENT__________" echo "CI_SERVER_NAME: " $CI_SERVER_NAME echo "CARGO_HOME: " $CARGO_HOME From 455a4aead37b9af7a7451ae5c008d07f77030551 Mon Sep 17 00:00:00 2001 From: felix Date: Thu, 11 Oct 2018 12:21:59 +0200 Subject: [PATCH 2/3] exchanged tag "rust-windows" with "windows" --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f86084c9e83..59ea6e3ed08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,6 @@ build-windows: script: - sh scripts/gitlab/build-windows.sh tags: - - rust-windows - windows <<: *collect_artifacts @@ -162,7 +161,6 @@ test-windows: script: - sh scripts/gitlab/test-all.sh stable tags: - - rust-windows - windows test-beta: From c97c2d44cd5271da6439df1a030dd1a1a83dcf52 Mon Sep 17 00:00:00 2001 From: felix Date: Thu, 18 Oct 2018 16:50:29 +0200 Subject: [PATCH 3/3] revert windows tag change --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59ea6e3ed08..80adaf45db0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,7 +84,7 @@ build-windows: script: - sh scripts/gitlab/build-windows.sh tags: - - windows + - rust-windows <<: *collect_artifacts publish-docker: @@ -161,7 +161,7 @@ test-windows: script: - sh scripts/gitlab/test-all.sh stable tags: - - windows + - rust-windows test-beta: stage: optional