From 8d9a06ce8ba55dfeb4fb3d6525ffc9bfb9f0c3ed Mon Sep 17 00:00:00 2001
From: Martin Beseda <martinbeseda@seznam.cz>
Date: Mon, 10 Sep 2018 13:48:36 +0200
Subject: [PATCH] Testing Win static deps compilation with the new version of
 FindBoost.cmake

---
 .gitlab-ci.yml              | 62 ++++++++++++++++++-------------------
 external_dependencies/boost |  2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b61eefb9..9adf89fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,21 @@
 # Windows 10 with Boost and Exprtk 
 # downloaded and compiled locally as
 # submodules and linked statically
-#win_visual_studio_static_deps:
-#    tags:
-#        - Win
-#
-#    before_script:
-#        - call VsDevCmd.bat
-#        - cd build_scripts\windows
-#        - call win_download_dependencies.bat
-#        - cd ..\..
-#        - cd build_scripts\windows
-#        - set DEPENDENCIES_LINK_TYPE=static
-#        - call win_VS_build_x64_debug.bat
-#
-#    script:
-#        - call win_run_tests.bat
+win_visual_studio_static_deps:
+    tags:
+        - Win
+
+    before_script:
+        - call VsDevCmd.bat
+        - cd build_scripts\windows
+        - call win_download_dependencies.bat
+        - cd ..\..
+        - cd build_scripts\windows
+        - set DEPENDENCIES_LINK_TYPE=static
+        - call win_VS_build_x64_debug.bat
+
+    script:
+        - call win_run_tests.bat
 
 # Windows 10 with Boost and Exprtk 
 # downloaded and compiled locally as
@@ -102,19 +102,19 @@
 #        - './linux_run_tests.sh'
 
 
-code_quality:
-  image: docker:stable
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [gl-code-quality-report.json]
+#code_quality:
+#  image: docker:stable
+#  variables:
+#    DOCKER_DRIVER: overlay2
+#  allow_failure: true
+#  services:
+#    - docker:stable-dind
+#  script:
+#    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+#    - docker run
+#        --env SOURCE_CODE="$PWD"
+#        --volume "$PWD":/code
+#        --volume /var/run/docker.sock:/var/run/docker.sock
+#        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+#  artifacts:
+#    paths: [gl-code-quality-report.json]
diff --git a/external_dependencies/boost b/external_dependencies/boost
index 65b96e76..f7371ecb 160000
--- a/external_dependencies/boost
+++ b/external_dependencies/boost
@@ -1 +1 @@
-Subproject commit 65b96e76f6c51b5492bc5ef2d0d67aad8d6ae801
+Subproject commit f7371ecb0652555ec89cb28e58c18fda56685985
-- 
GitLab