3 files changed, 32 insertions, 71 deletions
diff --git a/.github/workflows/cd-version.yaml b/.github/workflows/cd-version.yaml
index 963649ca..6d19cca5 100644
--- a/.github/workflows/cd-version.yaml
+++ b/.github/workflows/cd-version.yaml
@@ -1,24 +1,26 @@
-name: Build And Upload Versioned Docker Image
-
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+*"
-    paths-ignore:
-      - "**/README.md"
-
-jobs:
-  deploy:
-    name: Build And Push Docker
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Build And Push to Docker Hub
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          repository: crupest/timeline
-          tag_with_ref: true
+name: Build And Upload Versioned Docker Image
+
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+*"
+    paths-ignore:
+      - "**/README.md"
+
+jobs:
+  deploy:
+    name: Build And Push Docker
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Build And Push to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          repository: crupest/timeline
+          tag_with_ref: true
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 0e93a1b4..a82b68af 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -13,6 +13,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - name: Build And Push to Docker Hub
         uses: docker/build-push-action@v1
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5cfe9a8a..4108ad1f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,4 +1,4 @@
-name: Routine Build And Test
+name: CI
 
 on:
   push:
@@ -11,51 +11,8 @@ on:
       - "**/README.md"
 
 jobs:
-  front-end:
-    name: Front End Build
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: Timeline/ClientApp
-        shell: bash
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Restore Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            Timeline/ClientApp/.pnp.*
-            Timeline/ClientApp/.yarn
-            !Timeline/ClientApp/.yarn/releases
-            !Timeline/ClientApp/.yarn/plugins
-          key: yarn-${{ runner.os }}-${{ hashFiles('Timeline/ClientApp/yarn.lock') }}
-          restore-keys: |
-            yarn-${{ runner.os }}-
-
-      - name: Use Node.js 14
-        uses: actions/setup-node@v1
-        with:
-          node-version: "14"
-
-      - name: Restore Packages
-        run: yarn
-
-      - name: Build App
-        run: yarn build
-
-      - name: Lint Code
-        run: yarn lint
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: front-end
-          path: Timeline/ClientApp/dist/
-
-  back-end:
-    name: Back End Build And Test
+  build:
+    name: Build And Test
     runs-on: ubuntu-latest
     env:
       ASPNETCORE_ENVIRONMENT: "Development"
@@ -84,5 +41,5 @@ jobs:
         uses: actions/upload-artifact@v2
         if: ${{ success() || failure() }}
         with:
-          name: back-end-test
+          name: test-result
           path: Timeline.Tests/TestResults/