Refactor small suite path function to improve log file retrieval

Tomasz Wojcikowski · Tomasz Wojcikowski · commit a560aafc8d2b · 2025-12-03T12:30:44.000+01:00
diff --git a/tools/circle-publish-github-comment.sh b/tools/circle-publish-github-comment.sh
@@ -85,12 +85,10 @@ function last_ct_run_name
 }
 
 
-function small_suite_path
+function last_small_ct_run_name
 {
     if [ -d _build/test/logs ]; then
-        cd _build/test/logs
-        ls -t -1 ct_run.mongooseim@localhost.*/lib.mongooseim.logs/run.*/suite.log.html
-        cd ../../..
+        ls -1 -t _build/test/logs/ | grep ct_run | head -n1
     fi
 }
 
@@ -106,8 +104,8 @@ function ct_small_url
 {
     local CT_REPORTS=$(ct_reports_dir)
     local SMALL_TESTS_URL="$(archive_reader_url small ${CT_REPORTS})"
-    local SUFFIX=$(small_suite_path)
-    echo "$SMALL_TESTS_URL/$SUFFIX"
+    local RUN_PART=$(echo "$(last_small_ct_run_name)" | sed "s/@/%40/g")
+    echo "$SMALL_TESTS_URL/$RUN_PART/index.html"
 }
 
 function reports_url

Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,10 @@ function last_ct_run_name`
`85`	`85`	`}`
`86`	`86`
`87`	`87`
`88`		`-function small_suite_path`
	`88`	`+function last_small_ct_run_name`
`89`	`89`	`{`
`90`	`90`	`if [ -d _build/test/logs ]; then`
`91`		`- cd _build/test/logs`
`92`		`- ls -t -1 ct_run.mongooseim@localhost./lib.mongooseim.logs/run./suite.log.html`
`93`		`- cd ../../..`
	`91`	`+ ls -1 -t _build/test/logs/ \| grep ct_run \| head -n1`
`94`	`92`	`fi`
`95`	`93`	`}`
`96`	`94`
`@@ -106,8 +104,8 @@ function ct_small_url`
`106`	`104`	`{`
`107`	`105`	`local CT_REPORTS=$(ct_reports_dir)`
`108`	`106`	`local SMALL_TESTS_URL="$(archive_reader_url small ${CT_REPORTS})"`
`109`		`- local SUFFIX=$(small_suite_path)`
`110`		`- echo "$SMALL_TESTS_URL/$SUFFIX"`
	`107`	`+ local RUN_PART=$(echo "$(last_small_ct_run_name)" \| sed "s/@/%40/g")`
	`108`	`+ echo "$SMALL_TESTS_URL/$RUN_PART/index.html"`
`111`	`109`	`}`
`112`	`110`
`113`	`111`	`function reports_url`