From 6ff8749809e8690febf6118cb6c8a8f284da56b5 Mon Sep 17 00:00:00 2001
From: Alan Nelson <alan.nelson@nebraska.edu>
Date: Tue, 23 Feb 2021 18:19:51 -0600
Subject: [PATCH] Use DAG in build pipeline

---
 .gitlab/ci/build.yml   | 11 -----------
 .gitlab/ci/publish.yml | 15 +++++++++------
 .gitlab/ci/test.yml    |  2 ++
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 0f06079..ea8a2d7 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -1,14 +1,3 @@
-Make All Images:
-  stage: build
-  tags:
-    - linux
-    - dockerd
-  script:
-    - make
-  only:
-    variables:
-      - $BUILD_ALL == "true"
-
 Make PHP Lint:
   stage: build
   tags:
diff --git a/.gitlab/ci/publish.yml b/.gitlab/ci/publish.yml
index 6df3202..0e1d2d9 100644
--- a/.gitlab/ci/publish.yml
+++ b/.gitlab/ci/publish.yml
@@ -12,16 +12,11 @@
   script:
     - make publish
 
-Publish All Images:
-  <<: *push_to_registry
-  only:
-    variables:
-      - $PUBLISH_ALL == "true"
-
 Publish PHP Lint:
   <<: *push_to_registry
   variables:
     IMG_NAME: "php-lint"
+  needs: ["Make PHP Lint"]
   only:
     refs:
       - master
@@ -33,6 +28,7 @@ Publish PHP Unit Test:
   <<: *push_to_registry
   variables:
     IMG_NAME: "php-unit-test"
+  needs: ["Make PHP Unit Test"]
   only:
     refs:
       - master
@@ -44,6 +40,7 @@ Publish Android Build:
   <<: *push_to_registry
   variables:
     IMG_NAME: "android-build-server"
+  needs: ["Make Android Build"]
   only:
     refs:
       - master
@@ -55,6 +52,7 @@ Publish Static Code Analysis:
   <<: *push_to_registry
   variables:
     IMG_NAME: "static-code-analysis"
+  needs: ["Make Static Code Analysis"]
   only:
     refs:
       - master
@@ -66,6 +64,7 @@ Publish Alpine SSH Client:
   <<: *push_to_registry
   variables:
     IMG_NAME: "alpine-ssh-client"
+  needs: ["Make Alpine SSH Client"]
   only:
     refs:
       - master
@@ -77,6 +76,7 @@ Publish Merge Check:
   <<: *push_to_registry
   variables:
     IMG_NAME: "merge-request-check"
+  needs: ["Make Merge Request Check"]
   only:
     refs:
       - master
@@ -88,6 +88,7 @@ Publish XML Lint:
   <<: *push_to_registry
   variables:
     IMG_NAME: "xml-lint"
+  needs: ["Make XML Lint"]
   only:
     refs:
       - master
@@ -99,6 +100,7 @@ Publish Dependency Check:
   <<: *push_to_registry
   variables:
     IMG_NAME: "dependency-check"
+  needs: ["Make Dependency Check"]
   only:
     refs:
       - master
@@ -110,6 +112,7 @@ Publish Detect Secrets:
   <<: *push_to_registry
   variables:
     IMG_NAME: "detect-secrets"
+  needs: ["Make Detect Secrets"]
   only:
     refs:
       - master
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 7ee5f63..0242098 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -3,6 +3,7 @@ Test Container Versions:
   tags:
     - linux
     - dockerd
+  needs: ["Make Static Code Analysis", "Make Detect Secrets", "Make Dependency Check"]
   only:
     - develop
   script:
@@ -15,6 +16,7 @@ Test PHP Lint:
   tags:
     - linux
     - dockerd
+  needs: ["Make PHP Lint"]
   only:
     - develop
   script:
-- 
GitLab