From 53e8460ec22516076f15c61fa6f9847f3f9869b9 Mon Sep 17 00:00:00 2001
From: Curtis Vogt <curtis.vogt@gmail.com>
Date: Fri, 14 Feb 2020 12:15:28 -0600
Subject: [PATCH] Switch to using GitLab CI extends

---
 templates/gitlab-ci.yml                       | 37 ++++++++--------
 test/fixtures/AllPlugins/.gitlab-ci.yml       | 42 +++++++++----------
 test/fixtures/WackyOptions/.gitlab-ci.yml     | 18 ++++----
 test/fixtures/WackyOptions/docs/Manifest.toml |  2 +-
 4 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/templates/gitlab-ci.yml b/templates/gitlab-ci.yml
index 774b2180..bd4a785a 100644
--- a/templates/gitlab-ci.yml
+++ b/templates/gitlab-ci.yml
@@ -1,28 +1,27 @@
-.definitions:
-  script: &script
-    script:
-      - julia --project=@. -e '
-          using Pkg;
-          Pkg.build();
-          Pkg.test({{#HAS_COVERAGE}}; coverage=true{{/HAS_COVERAGE}});'
+.script:
+  - julia --project=@. -e '
+      using Pkg;
+      Pkg.build();
+      Pkg.test({{#HAS_COVERAGE}}; coverage=true{{/HAS_COVERAGE}});'
 {{#HAS_COVERAGE}}
-  coverage: &coverage
-    coverage: /Test coverage (\d+\.\d+%)/
-    after_script:
-      - julia -e '
-          using Pkg;
-          Pkg.add("Coverage");
-          using Coverage;
-          c, t = get_summary(process_folder());
-          using Printf;
-          @printf "Test coverage %.2f%%\n" 100c / t;'
+.coverage:
+  coverage: /Test coverage (\d+\.\d+%)/
+  after_script:
+    - julia -e '
+        using Pkg;
+        Pkg.add("Coverage");
+        using Coverage;
+        c, t = get_summary(process_folder());
+        using Printf;
+        @printf "Test coverage %.2f%%\n" 100c / t;'
 {{/HAS_COVERAGE}}
 {{#VERSIONS}}
 Julia {{{.}}}:
   image: julia:{{{.}}}
-  <<: *script
+  extends:
+    - .script
 {{#HAS_COVERAGE}}
-  <<: *coverage
+    - .coverage
 {{/HAS_COVERAGE}}
 {{/VERSIONS}}
 {{#HAS_DOCUMENTER}}
diff --git a/test/fixtures/AllPlugins/.gitlab-ci.yml b/test/fixtures/AllPlugins/.gitlab-ci.yml
index 62e06877..c06931bd 100644
--- a/test/fixtures/AllPlugins/.gitlab-ci.yml
+++ b/test/fixtures/AllPlugins/.gitlab-ci.yml
@@ -1,25 +1,25 @@
-.definitions:
-  script: &script
-    script:
-      - julia --project=@. -e '
-          using Pkg;
-          Pkg.build();
-          Pkg.test(; coverage=true);'
-  coverage: &coverage
-    coverage: /Test coverage (\d+\.\d+%)/
-    after_script:
-      - julia -e '
-          using Pkg;
-          Pkg.add("Coverage");
-          using Coverage;
-          c, t = get_summary(process_folder());
-          using Printf;
-          @printf "Test coverage %.2f%%\n" 100c / t;'
+.script:
+  - julia --project=@. -e '
+      using Pkg;
+      Pkg.build();
+      Pkg.test(; coverage=true);'
+.coverage:
+  coverage: /Test coverage (\d+\.\d+%)/
+  after_script:
+    - julia -e '
+        using Pkg;
+        Pkg.add("Coverage");
+        using Coverage;
+        c, t = get_summary(process_folder());
+        using Printf;
+        @printf "Test coverage %.2f%%\n" 100c / t;'
 Julia 1.0:
   image: julia:1.0
-  <<: *script
-  <<: *coverage
+  extends:
+    - .script
+    - .coverage
 Julia 1.3:
   image: julia:1.3
-  <<: *script
-  <<: *coverage
+  extends:
+    - .script
+    - .coverage
diff --git a/test/fixtures/WackyOptions/.gitlab-ci.yml b/test/fixtures/WackyOptions/.gitlab-ci.yml
index 88c61198..898d3a7d 100644
--- a/test/fixtures/WackyOptions/.gitlab-ci.yml
+++ b/test/fixtures/WackyOptions/.gitlab-ci.yml
@@ -1,16 +1,16 @@
-.definitions:
-  script: &script
-    script:
-      - julia --project=@. -e '
-          using Pkg;
-          Pkg.build();
-          Pkg.test();'
+.script:
+  - julia --project=@. -e '
+      using Pkg;
+      Pkg.build();
+      Pkg.test();'
 Julia 0.6:
   image: julia:0.6
-  <<: *script
+  extends:
+    - .script
 Julia 1.2:
   image: julia:1.2
-  <<: *script
+  extends:
+    - .script
 pages:
   image: julia:1.2
   stage: deploy
diff --git a/test/fixtures/WackyOptions/docs/Manifest.toml b/test/fixtures/WackyOptions/docs/Manifest.toml
index 0e4b168e..80655c84 100644
--- a/test/fixtures/WackyOptions/docs/Manifest.toml
+++ b/test/fixtures/WackyOptions/docs/Manifest.toml
@@ -56,7 +56,7 @@ uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
 version = "0.3.10"
 
 [[Pkg]]
-deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[Printf]]