fix dashboard URL

qgis · Feb 3, 2021 · 02583e1 · 02583e1
1 parent 19c0a63
commit 02583e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.ci/config.ctest b/.ci/config.ctest
@@ -55,7 +55,7 @@ ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE BUILDRES NUMBER_WARN
 # CDash on OTB requires the date to be set for the search to work and that's the timezone this requires
 SET(ENV{TZ} "UTC-6")
 EXECUTE_PROCESS(COMMAND date +%Y-%m-%d OUTPUT_VARIABLE CDASH_DATE)
-SET(RESULT_LINK "http://cdash.orfeo-toolbox.org/index.php?project=QGIS&filtercount=1&showfilters=1&field1=buildname/string&compare1=63&value1=$ENV{GITHUB_SHA}&date=${CDASH_DATE}")
+SET(RESULT_LINK "http://cdash.orfeo-toolbox.org/index.php?project=QGIS&filtercount=1&showfilters=1&field1=buildname/string&compare1=63&value1=$ENV{CTEST_BUILD_NAME}&date=${CDASH_DATE}")
 EXECUTE_PROCESS(COMMAND curl --data-urlencode "url=${RESULT_LINK}" -s http://tinyurl.com/api-create.php
                 OUTPUT_VARIABLE SHORTURL)
 

diff --git a/.docker/docker-variables.env b/.docker/docker-variables.env
@@ -5,6 +5,8 @@ SEGFAULT_SIGNALS="abrt segv"
 CTEST_BUILD_COMMAND=/usr/bin/ninja
 CTEST_PARALLEL_LEVEL=1
 CTEST_BUILD_DIR=/root/QGIS
+# CTEST vars defined in workflow
+CTEST_BUILD_NAME
 
 # Other var
 QGIS_NO_OVERRIDE_IMPORT=1

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -44,7 +44,7 @@ jobs:
           GITHUB_PR_NUMBER: ${{github.event.number}}
         run: |
           DOCKER_TAG=$(echo $( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo ${GITHUB_BASE_REF} || echo ${GITHUB_REF##*/} ) | sed 's/^master$/latest/')
-          CTEST_BUILD_NAME=$( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo PR ${GITHUB_PR_NUMBER} || echo ${GITHUB_REF##*/} )" (${GITHUB_SHA})"
+          CTEST_BUILD_NAME=$( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo "PR${GITHUB_PR_NUMBER}" || echo ${GITHUB_REF##*/} )"_${GITHUB_SHA}"
           echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV
           echo "CTEST_BUILD_NAME=${CTEST_BUILD_NAME}" >> $GITHUB_ENV