Add both build scan identifiers as output

Signed-off-by: Jerome Prinet <jprinet@gradle.com>

Author: jprinet

.github/composite/exp1/action.yml

@@ -1,5 +1,5 @@
 name: Run experiment 1
-description: 'Run Gradle Experiment 1'
+description: "Run Gradle Experiment 1"
 
 inputs:
   repositoryUrl:
@@ -19,9 +19,12 @@ inputs:
     description: "Gradle Enterprise URL"
     required: true
 outputs:
-  secondBuildScanUrl:
-    description: "Second build scan URL"
-    value: ${{ steps.run.outputs.secondBuildScanUrl }}
+  buildScanId1:
+    description: "First build scan identifier"
+    value: ${{ steps.run.outputs.buildScanId1 }}
+  buildScanId2:
+    description: "Second build scan identifier"
+    value: ${{ steps.run.outputs.buildScanId2 }}
 
 runs:
   using: "composite"
@@ -31,15 +34,16 @@ runs:
       run: |
         cd gradle-enterprise-gradle-build-validation
 
-        # add instruction to save build scan url
-        BUILD_SCAN_FILE=$(pwd)/build-scan-url.txt
-        echo "echo \$build_scan_urls > ${BUILD_SCAN_FILE}" >> 01-validate-incremental-building.sh
+        # add instructions to save build scan urls
+        BUILD_SCAN_FILE_1=$(pwd)/exp1-build-scan-url-1.txt
+        BUILD_SCAN_FILE_2=$(pwd)/exp1-build-scan-url-2.txt
+        echo "echo \${build_scan_urls[0]} > ${BUILD_SCAN_FILE_1}" >> 01-validate-incremental-building.sh
+        echo "echo \${build_scan_urls[1]} > ${BUILD_SCAN_FILE_2}" >> 01-validate-incremental-building.sh
 
         # run experiment
         ./01-validate-incremental-building.sh -r ${{ inputs.repositoryUrl }} -b ${{ inputs.branch }} -t ${{ inputs.task }} -p ${{ inputs.projectDir }} -s ${{ inputs.gradleEnterpriseUrl }}
 
-        cat $BUILD_SCAN_FILE
-
         # set scan url as output
-        echo "::set-output name=secondBuildScanUrl::$(cat ${BUILD_SCAN_FILE})"
+        echo "::set-output name=buildScanId1::$(cat ${BUILD_SCAN_FILE_1} | sed 's:.*/::')"
+        echo "::set-output name=buildScanId2::$(cat ${BUILD_SCAN_FILE_2} | sed 's:.*/::')"
       shell: bash

.github/composite/exp2/action.yml

@@ -1,5 +1,5 @@
 name: Run experiment 2
-description: 'Run Gradle Experiment 2'
+description: "Run Gradle Experiment 2"
 
 inputs:
   repositoryUrl:
@@ -19,9 +19,12 @@ inputs:
     description: "Gradle Enterprise URL"
     required: true
 outputs:
-  secondBuildScanUrl:
-    description: "Second build scan URL"
-    value: ${{ steps.run.outputs.secondBuildScanUrl }}
+  buildScanId1:
+    description: "First build scan identifier"
+    value: ${{ steps.run.outputs.buildScanId1 }}
+  buildScanId2:
+    description: "Second build scan identifier"
+    value: ${{ steps.run.outputs.buildScanId2 }}
 
 runs:
   using: "composite"
@@ -31,13 +34,16 @@ runs:
       run: |
         cd gradle-enterprise-gradle-build-validation
 
-        # add instruction to save build scan url
-        BUILD_SCAN_FILE=$(pwd)/build-scan-url.txt
-        echo "echo \$build_scan_urls > ${BUILD_SCAN_FILE}" >> 02-validate-local-build-caching-same-location.sh
+        # add instructions to save build scan urls
+        BUILD_SCAN_FILE_1=$(pwd)/exp2-build-scan-url-1.txt
+        BUILD_SCAN_FILE_2=$(pwd)/exp2-build-scan-url-2.txt
+        echo "echo \${build_scan_urls[0]} > ${BUILD_SCAN_FILE_1}" >> 02-validate-local-build-caching-same-location.sh
+        echo "echo \${build_scan_urls[1]} > ${BUILD_SCAN_FILE_2}" >> 02-validate-local-build-caching-same-location.sh
 
         # run experiment
         ./02-validate-local-build-caching-same-location.sh -r ${{ inputs.repositoryUrl }} -b ${{ inputs.branch }} -t ${{ inputs.task }} -p ${{ inputs.projectDir }} -s ${{ inputs.gradleEnterpriseUrl }}
 
         # set scan url as output
-        echo "::set-output name=secondBuildScanUrl::$(cat ${BUILD_SCAN_FILE})"
+        echo "::set-output name=buildScanId1::$(cat ${BUILD_SCAN_FILE_1} | sed 's:.*/::')"
+        echo "::set-output name=buildScanId2::$(cat ${BUILD_SCAN_FILE_2} | sed 's:.*/::')"
       shell: bash

.github/composite/exp3/action.yml

@@ -1,5 +1,5 @@
 name: Run experiment 3
-description: 'Run Gradle Experiment 3'
+description: "Run Gradle Experiment 3"
 
 inputs:
   repositoryUrl:
@@ -19,9 +19,12 @@ inputs:
     description: "Gradle Enterprise URL"
     required: true
 outputs:
-  secondBuildScanUrl:
-    description: "Second build scan URL"
-    value: ${{ steps.run.outputs.secondBuildScanUrl }}
+  buildScanId1:
+    description: "First build scan identifier"
+    value: ${{ steps.run.outputs.buildScanId1 }}
+  buildScanId2:
+    description: "Second build scan identifier"
+    value: ${{ steps.run.outputs.buildScanId2 }}
 
 runs:
   using: "composite"
@@ -31,13 +34,16 @@ runs:
       run: |
         cd gradle-enterprise-gradle-build-validation
 
-        # add instruction to save build scan url
-        BUILD_SCAN_FILE=$(pwd)/build-scan-url.txt
-        echo "echo \$build_scan_urls > ${BUILD_SCAN_FILE}" >> 03-validate-local-build-caching-different-locations.sh
+        # add instructions to save build scan urls
+        BUILD_SCAN_FILE_1=$(pwd)/exp3-build-scan-url-1.txt
+        BUILD_SCAN_FILE_2=$(pwd)/exp3-build-scan-url-2.txt
+        echo "echo \${build_scan_urls[0]} > ${BUILD_SCAN_FILE_1}" >> 03-validate-local-build-caching-different-locations.sh
+        echo "echo \${build_scan_urls[1]} > ${BUILD_SCAN_FILE_2}" >> 03-validate-local-build-caching-different-locations.sh
 
         # run experiment
         ./03-validate-local-build-caching-different-locations.sh -r ${{ inputs.repositoryUrl }} -b ${{ inputs.branch }} -t ${{ inputs.task }} -p ${{ inputs.projectDir }} -s ${{ inputs.gradleEnterpriseUrl }}
 
         # set scan url as output
-        echo "::set-output name=secondBuildScanUrl::$(cat ${BUILD_SCAN_FILE})"
+        echo "::set-output name=buildScanId1::$(cat ${BUILD_SCAN_FILE_1} | sed 's:.*/::')"
+        echo "::set-output name=buildScanId2::$(cat ${BUILD_SCAN_FILE_2} | sed 's:.*/::')"
       shell: bash