From 2789db50af4e04ee6def6c6a56cf349feac81328 Mon Sep 17 00:00:00 2001
From: Alfredo Matas <amatas@gmail.com>
Date: Tue, 8 Aug 2017 18:16:08 +0200
Subject: [PATCH 1/4] Add CI test

---
 .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++++
 .vagrant.yml   | 31 +++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 .vagrant.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..f7eee32
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,37 @@
+---
+
+cache:
+  key: "$CI_BUILD_REF_NAME"
+  untracked: true
+  paths:
+    - node_modules/
+
+stages:
+  - test_win10
+
+before_script:
+  - "mkdir -p ../.vagrant-$CI_BUILD_REF_NAME"
+  - rm -fr .vagrant
+  - "ln -s ../.vagrant-$CI_BUILD_REF_NAME .vagrant"
+
+after_script:
+  - vagrant destroy -f
+  - "rm -fr ../.vagrant-$CI_BUILD_REF_NAME"
+
+test_win10_x86_job:
+  stage: test_win10
+  script:
+    - vagrant up windows10-x86
+    - vagrant ci test windows10-x86
+  when: always
+  tags:
+    - box_build
+
+test_win10_x64_job:
+  stage: test_win10
+  script:
+    - vagrant up windows10-x64
+    - vagrant ci test windows10-x64
+  when: always
+  tags:
+    - box_build
diff --git a/.vagrant.yml b/.vagrant.yml
new file mode 100644
index 0000000..57568df
--- /dev/null
+++ b/.vagrant.yml
@@ -0,0 +1,31 @@
+---
+
+env:
+  default: &default          # 'default' will be merged below
+    gui: false
+    cpu: 2                   # number of cpus
+    memory: 2048             # amount of RAM memory
+    clone: true              # use the linked_clone Vagrant feature
+    autostart: false         # only start the VM specfied in the command line
+  vms:
+    windows10-x64:           # name of the VM
+      <<: *default           # referece of the common part
+      box: windows10-eval-x64-Apps
+    windows10-x86:           # name of the VM
+      <<: *default           # referece of the common part
+      box: windows10-eval-x86-Apps
+
+stages:
+  - setup
+  - test
+
+setup_job:
+  stage: setup
+  script:
+    - do.ps1 -c 'echo "Hello!"'
+
+test_job:
+  stage: test          # name of the stage
+  script:              # One line per command to execute
+    - do.ps1 -c 'dir c:\'
+

From 4eb438eca6ca92ed5eda0b55d33448f3c550cbac Mon Sep 17 00:00:00 2001
From: Alfredo Matas <amatas@gmail.com>
Date: Thu, 10 Aug 2017 17:38:29 +0200
Subject: [PATCH 2/4] Remove gitlab tags

---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7eee32..0596c41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,6 @@ test_win10_x86_job:
     - vagrant up windows10-x86
     - vagrant ci test windows10-x86
   when: always
-  tags:
-    - box_build
 
 test_win10_x64_job:
   stage: test_win10
@@ -33,5 +31,3 @@ test_win10_x64_job:
     - vagrant up windows10-x64
     - vagrant ci test windows10-x64
   when: always
-  tags:
-    - box_build

From d21cf2207613bc665f40e77ec715336defb323d7 Mon Sep 17 00:00:00 2001
From: Alfredo Matas <amatas@gmail.com>
Date: Thu, 10 Aug 2017 17:44:22 +0200
Subject: [PATCH 3/4] Fix vagrant boxes

---
 .vagrant.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vagrant.yml b/.vagrant.yml
index 57568df..a6c95d2 100644
--- a/.vagrant.yml
+++ b/.vagrant.yml
@@ -10,10 +10,10 @@ env:
   vms:
     windows10-x64:           # name of the VM
       <<: *default           # referece of the common part
-      box: windows10-eval-x64-Apps
+      box: inclusivedesign/windows10-eval-x64-Apps
     windows10-x86:           # name of the VM
       <<: *default           # referece of the common part
-      box: windows10-eval-x86-Apps
+      box: inclusivedesign/windows10-eval-x86-Apps
 
 stages:
   - setup

From 4a655e8766e10200b6949673833378f30537e9df Mon Sep 17 00:00:00 2001
From: Alfredo Matas <amatas@gmail.com>
Date: Thu, 10 Aug 2017 20:00:08 +0200
Subject: [PATCH 4/4] Add new test

---
 .vagrant.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vagrant.yml b/.vagrant.yml
index a6c95d2..db332dc 100644
--- a/.vagrant.yml
+++ b/.vagrant.yml
@@ -23,6 +23,7 @@ setup_job:
   stage: setup
   script:
     - do.ps1 -c 'echo "Hello!"'
+    - do.ps1 -c 'echo "Hello2!"'
 
 test_job:
   stage: test          # name of the stage