From c964a58afd20e5dbfd137bec3529bff2ad64404a Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Tue, 29 Sep 2020 20:10:23 +0200
Subject: [PATCH 1/2] Fix issues with gitlab not caching/artifacting the
 correct things

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 366d57a..4cf26fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   OBJECTS_DIRECTORY: 'obj'
   NUGET_PACKAGES_DIRECTORY: '.nuget'
-  SOURCE_CODE_PATH: 'ChaosBot/*/'
-  NODE_MODULES_DIRECTORY: 'ChaosBot/wwwroot/node_modules'
+  SOURCE_CODE_PATH: 'ChaosBot/'
+  NODE_MODULES_DIRECTORY: 'wwwroot/node_modules'
   
 stages:
   - version
@@ -30,7 +30,7 @@ cache:
     # 3) Path to the directory where restored dependencies are kept.
     - '$NUGET_PACKAGES_DIRECTORY'
     # 4) Path to node_modules
-    - '$NODE_MODULES_DIRECTORY'
+    - '$SOURCE_CODE_PATH$NODE_MODULES_DIRECTORY'
   #
   policy: pull-push
 
@@ -129,7 +129,7 @@ tests_node:
     - 'yarn lint'
   artifacts:
     paths:
-      - wwwroot/dist/
+      - ChaosBot/wwwroot/dist/
       
 release_node:
   image: node:latest
@@ -150,7 +150,7 @@ release_node:
     - 'yarn build'
   artifacts:
     paths:
-      - wwwroot/dist/**
+      - ChaosBot/wwwroot/dist/**
 
 docker:
   image: docker:stable

From 4d9be048be44d0ea01c5140d37fb4373b36e1491 Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Tue, 29 Sep 2020 20:12:45 +0200
Subject: [PATCH 2/2] Make names of jobs clearer

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4cf26fc..2032cda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ version:
     paths:
       - version
 
-build:
+build_dotnet:
   stage: build
   only:
     changes:
@@ -75,7 +75,7 @@ build:
     - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY'
     - 'dotnet build --no-restore'
 
-tests:
+tests_dotnet:
   stage: test
   only:
     changes:
@@ -83,7 +83,7 @@ tests:
     refs:
       - master
   dependencies:
-    - build
+    - build_dotnet
   tags:
   - docker
   - hawkeye
@@ -91,7 +91,7 @@ tests:
     - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY'
     - 'dotnet test --no-restore'
     
-release:
+release_dotnet:
   stage: release
   only:
     changes:
@@ -99,7 +99,7 @@ release:
     refs:
       - master
   dependencies:
-    - tests
+    - tests_dotnet
   tags:
   - docker
   - hawkeye
@@ -165,7 +165,7 @@ docker:
   - hawkeye
   dependencies:
     - version
-    - release
+    - release_dotnet
     - release_node
   script:
     # Log in to the registry