Use a newly built web resource collector in CI

.gitlab-ci.yml

@@ -18,13 +18,18 @@ npm:
     paths:
       - Libraries/node_modules
 
-linux-x64:
+.base:
   stage: test
   before_script:
     - install_clean.sh bundle-complete
     - apt-get update -qq
     - apt-get install -y -qq build-essential libsqlite3-dev libmariadbclient-dev-compat
   script:
+    - cd Tools
+    - cp WebResourceCollector.prj{.default,}
+    - cpm WebResourceCollector.prj
+    - cp WebResourceCollector $CLEAN_HOME/lib/exe/itasks-web-collector
+    - cd ..
     - bash Tests/posix.sh
   artifacts:
     when: always
@@ -33,8 +38,11 @@ linux-x64:
     reports:
       junit: Tests/Unit/*-junit.xml
 
+linux-x64:
+  extends: .base
+
 linux-x86:
-  stage: test
+  extends: .base
   only:
     - master
   before_script:
@@ -42,17 +50,9 @@ linux-x86:
     - apt-get update -qq
     - apt-get install -y -qq build-essential libsqlite3-dev:i386 libmariadbclient-dev-compat:i386
     - sed -i 's/x64/x86/g' Tests/posix.sh
-  script:
-    - bash Tests/posix.sh
-  artifacts:
-    when: always
-    paths:
-      - Tests/Unit/*-junit.xml
-    reports:
-      junit: Tests/Unit/*-junit.xml
 
 windows-x64:
-  stage: test
+  extends: .base
   only:
     - master
   tags:
@@ -67,13 +67,12 @@ windows-x64:
     - $Env:CLEAN_HOME = "$Pwd\\clean-bundle-complete"
     - $Env:Path += ";${Env:CLEAN_HOME}"
   script:
+    - cd Tools
+    - sed 's/lib/Libraries/' WebResourceCollector.prj.default | Out-File -encoding ASCII WebResourceCollector.prj
+    - Start-Process -NoNewWindow -Wait cpm -ArgumentList WebResourceCollector.prj
+    - cp WebResourceCollector.exe "${Env:CLEAN_HOME}\\Tools\\Clean System\\WebResourceCollector.exe"
+    - cd ..
     - bash Tests/windows.sh
-  artifacts:
-    when: always
-    paths:
-      - Tests/Unit/*-junit.xml
-    reports:
-      junit: Tests/Unit/*-junit.xml
 
 selenium:
   stage: test