From 4aa20937b8ea11b6da8e9eecb53a76f99af74dca Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4abk3g@protonmail.com>
Date: Mon, 20 Sep 2021 17:02:17 +0200
Subject: [PATCH] Extract paths into variables

---
 .gitlab-ci.yml | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3efa32..1ef6da0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,13 @@ variables:
   -Dprism.text=t2k \
   -Dtestfx.setup.timeout=60000"
 
+  # Paths relative to flashy/
+  SUREFIRE_REPORTS_PATH: "target/surefire-reports"
+  WEBSITE_PATH: "target/staging"
+  COBERTURA_PATH: "$WEBSITE_PATH/cobertura.xml"
+  RAW_JACOCO_AGGREGATE_PATH: "report/target/site/jacoco-aggregate"
+  JACOCO_AGGREGATE_PATH: "$WEBSITE_PATH/jacoco-aggregate"
+
 # Cache downloaded dependencies and plugins between builds.
 # To keep cache across branches add 'key: "$CI_JOB_NAME"'
 cache:
@@ -78,9 +85,9 @@ unittest:
     - "cd flashy"
     - "mvn test $MAVEN_CLI_OPTS"
     - "modules=($(xmlstarlet sel -N my=http://maven.apache.org/POM/4.0.0 -t -m '//my:module' -v . -o ' ' pom.xml))"
-    - "mkdir -p target/surefire-reports"
+    - "mkdir -p $SUREFIRE_REPORTS_PATH"
     - "for module in $modules; do"
-    - "  cp $module/target/surefire-reports/TEST-*.xml target/surefire-reports/ || :"
+    - "  cp $module/target/surefire-reports/TEST-*.xml $SUREFIRE_REPORTS_PATH || :"
     - "done"
   artifacts:
     paths:
@@ -88,7 +95,7 @@ unittest:
     when: always
     reports:
       junit:
-        - flashy/target/surefire-reports/TEST-*.xml
+        - flashy/$SUREFIRE_REPORTS_PATH/TEST-*.xml
 
 report:
   stage: report
@@ -100,34 +107,35 @@ report:
     - "sed -i 's/\\.\\.\\/\\.\\.\\/report\\/target\\/site\\/jacoco-aggregate\\/index.html/jacoco-aggregate\\/index.html/' src/site/site.xml"
     - 'mvn clean test $MAVEN_CLI_OPTS site site:stage'
     # Move real jacoco-aggregate to site
-    - 'rm -r target/staging/jacoco-aggregate'
-    - 'mv report/target/site/jacoco-aggregate target/staging/'
+    - 'rm -r $JACOCO_AGGREGATE_PATH'
+    - 'mv $RAW_JACOCO_AGGREGATE_PATH $WEBSITE_PATH'
   artifacts:
     paths:
-      - flashy/target/staging
+      - "flashy/$WEBSITE_PATH"
 
 process-coverage:
   stage: report-data-extraction
   image: haynes/jacoco2cobertura:1.0.7
   needs: [report]
+  variables:
   script:
     - 'cd flashy'
     # convert report from jacoco to cobertura
-    - 'python /opt/cover2cover.py report/target/site/jacoco-aggregate/jacoco.xml src/main/java > target/staging/cobertura.xml'
+    - 'python /opt/cover2cover.py $JACOCO_AGGREGATE_PATH/jacoco.xml src/main/java > $COBERTURA_PATH'
     # read the <source></source> tag and prepend the path to every filename attribute
-    - 'python /opt/source2filename.py target/staging/cobertura.xml'
-    - 'cat report/target/site/jacoco-aggregate/index.html'
+    - 'python /opt/source2filename.py $COBERTURA_PATH'
+    - 'cat $JACOCO_AGGREGATE_PATH/index.html'
   coverage: '/Total.*?([0-9]{1,3})%/'
   artifacts:
     reports:
-      cobertura: flashy/target/staging/cobertura.xml
+      cobertura: flashy/$COBERTURA_PATH
 
 pages:
   stage: deploy
   needs: [report]
   script:
     - 'mkdir public'
-    - 'mv flashy/target/staging/* public/'
+    - 'mv flashy/$WEBSITE_PATH/* public/'
   artifacts:
     paths:
       - public