piilloparametrit eksplisiittisiksi

scripts/publish-git-pages.sh

@@ -1,27 +1,28 @@
 #!/usr/bin/env bash
-# Publish a report directory to git-pages apex index-site via Traefik (BasicAuth).
-# Public URL: https://{PAGES_HOST}/{owner}/{repo}/reports/{sha8}/index.html
 set -euo pipefail
 
-REPORT_DIR="${1:-}"
-PAGES_HOST="${PAGES_HOST:-}"
-GIT_PAGES_PUBLISH_URL="${GIT_PAGES_PUBLISH_URL:-https://pages.helm-dev.keskikuja.site}"
-GIT_PAGES_PUBLISH_TOKEN="${GIT_PAGES_PUBLISH_TOKEN:-}"
-GIT_PAGES_PUBLISH_USER="${GIT_PAGES_PUBLISH_USER:-publish}"
+SUITE_PATH="${1:-}"
+PAGES_HOST="${2:-}"
+GIT_PAGES_PUBLISH_URL="${3:-}"
+GIT_PAGES_PUBLISH_TOKEN="${4:-}"
+GIT_PAGES_PUBLISH_USER="${5:-publish}"
 REPO_SLUG="${GITHUB_REPOSITORY:-}"
 
-[ -n "$REPORT_DIR" ] || { echo "ERROR: report directory argument required" >&2; exit 1; }
-[ -d "$REPORT_DIR" ] || { echo "ERROR: not a directory: $REPORT_DIR" >&2; exit 1; }
-[ -n "$PAGES_HOST" ] || { echo "ERROR: PAGES_HOST is not set" >&2; exit 1; }
-[ -n "$GIT_PAGES_PUBLISH_TOKEN" ] || { echo "ERROR: GIT_PAGES_PUBLISH_TOKEN is not set" >&2; exit 1; }
+[ -n "$SUITE_PATH" ] || { echo "ERROR: suite_path argument required" >&2; exit 1; }
+[ -n "$PAGES_HOST" ] || { echo "ERROR: pages_host argument is required" >&2; exit 1; }
+[ -n "$GIT_PAGES_PUBLISH_URL" ] || { echo "ERROR: publish_url argument is required" >&2; exit 1; }
+[ -n "$GIT_PAGES_PUBLISH_TOKEN" ] || { echo "ERROR: publish_token argument is required" >&2; exit 1; }
 [ -n "$REPO_SLUG" ] || { echo "ERROR: GITHUB_REPOSITORY is not set" >&2; exit 1; }
 [ -n "${GITHUB_SHA:-}" ] || { echo "ERROR: GITHUB_SHA is not set" >&2; exit 1; }
 
 OWNER="${REPO_SLUG%%/*}"
 REPO="${REPO_SLUG##*/}"
 SHA8="${GITHUB_SHA:0:8}"
+REPORT_DIR="reports/${SHA8}/${SUITE_PATH}"
 REPORT_BASE="https://${PAGES_HOST}/${OWNER}/${REPO}/reports/${SHA8}"
 
+[ -d "$REPORT_DIR" ] || { echo "ERROR: not a directory: $REPORT_DIR" >&2; exit 1; }
+
 PUBLISH_BASE="${GIT_PAGES_PUBLISH_URL%/}"
 PUBLISH_SITE_URL="${PUBLISH_BASE}/"
 

scripts/publish.sh

@@ -1,10 +1,23 @@
 #!/usr/bin/env bash
-# Vie raportit git-pagesiin + commit-status linkillä
 set -euo pipefail
 
-REPORT_DIR="${1:-reports}"
-PAGES_HOST="${PAGES_HOST:-ci-reports.helm-dev.keskikuja.site}"
+SUITE_PATH="${1:-}"
+GITEA_API_URL="${2:-}"
+GITEA_TOKEN="${3:-}"
+PAGES_HOST="${4:-}"
+GIT_PAGES_PUBLISH_URL="${5:-}"
+GIT_PAGES_PUBLISH_TOKEN="${6:-}"
+GIT_PAGES_PUBLISH_USER="${7:-publish}"
 
-REPORT_URL=$(bash "$(dirname $0)/publish-git-pages.sh" "$REPORT_DIR")
+[ -n "$SUITE_PATH" ] || { echo "ERROR: suite_path argument required" >&2; exit 1; }
+[ -n "$GITEA_API_URL" ] || { echo "ERROR: gitea_api_url argument required" >&2; exit 1; }
+[ -n "$GITEA_TOKEN" ] || { echo "ERROR: gitea_token argument required" >&2; exit 1; }
+[ -n "$PAGES_HOST" ] || { echo "ERROR: pages_host argument required" >&2; exit 1; }
+[ -n "$GIT_PAGES_PUBLISH_URL" ] || { echo "ERROR: publish_url argument required" >&2; exit 1; }
+[ -n "$GIT_PAGES_PUBLISH_TOKEN" ] || { echo "ERROR: publish_token argument required" >&2; exit 1; }
+
+SCRIPT_DIR="$(dirname "$0")"
+
+REPORT_URL=$(bash "$SCRIPT_DIR/publish-git-pages.sh" "$SUITE_PATH" "$PAGES_HOST" "$GIT_PAGES_PUBLISH_URL" "$GIT_PAGES_PUBLISH_TOKEN" "$GIT_PAGES_PUBLISH_USER")
 echo "Published: $REPORT_URL"
-bash "$(dirname $0)/report-status.sh" success "Reports published" "$REPORT_URL" ci-report
+bash "$SCRIPT_DIR/report-status.sh" success "Reports published" "$REPORT_URL" "$GITEA_API_URL" "$GITEA_TOKEN" "ci-report"

scripts/report-status.sh

@@ -1,19 +1,27 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-[ -z "${GITEA_API_URL:-}" ] && echo "ERROR: GITEA_API_URL is not set" >&2 && exit 1
-[ -z "${GITEA_TOKEN:-}" ] && echo "ERROR: GITEA_TOKEN is not set" >&2 && exit 1
-
 STATE="${1:-}"
 DESCRIPTION="${2:-}"
 URL="${3:-}"
-KEY="${4:-commit-${GITHUB_SHA:0:8}}"
-ROOT_COMMIT="${5:-}"
-ROOT_REPO="${6:-}"
+GITEA_API_URL="${4:-}"
+GITEA_TOKEN="${5:-}"
+KEY="${6:-commit-${GITHUB_SHA:0:8}}"
+PAGES_HOST="${7:-}"
+REPORT_PATH="${8:-}"
+ROOT_COMMIT="${9:-}"
+ROOT_REPO="${10:-}"
 
 [ -z "$STATE" ] && echo "ERROR: state argument is required" >&2 && exit 1
 [ -z "$DESCRIPTION" ] && echo "ERROR: description argument is required" >&2 && exit 1
-[ -z "$URL" ] && echo "ERROR: url argument is required" >&2 && exit 1
+[ -z "$GITEA_API_URL" ] && echo "ERROR: gitea_api_url argument is required" >&2 && exit 1
+[ -z "$GITEA_TOKEN" ] && echo "ERROR: gitea_token argument is required" >&2 && exit 1
+
+if [ -n "$REPORT_PATH" ]; then
+  URL="https://${PAGES_HOST}/${GITHUB_REPOSITORY}/reports/${GITHUB_SHA:0:8}/${REPORT_PATH}"
+elif [ -n "$PAGES_HOST" ]; then
+  URL="${GITEA_API_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
+fi
 
 if [ -n "$ROOT_COMMIT" ] && [ -n "$ROOT_REPO" ]; then
   REPO="$ROOT_REPO"