siivous: scriptit env-pohjaisiksi, validointi, siistit kutsut
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ERRORS=0
|
||||
|
||||
check_var() {
|
||||
local name="$1"
|
||||
local value="${!name:-}"
|
||||
if [ -z "$value" ]; then
|
||||
echo "ERROR: CI_ENV_MISSING $name is not set or empty. See docs/readme.md for required configuration." >&2
|
||||
ERRORS=1
|
||||
fi
|
||||
}
|
||||
|
||||
check_url() {
|
||||
local name="$1"
|
||||
local value="${!name:-}"
|
||||
check_var "$name"
|
||||
if [ -n "$value" ] && [[ "$value" != http://* ]] && [[ "$value" != https://* ]]; then
|
||||
echo "ERROR: CI_ENV_FORMAT $name should be a URL (starting with http:// or https://), got: $value" >&2
|
||||
ERRORS=1
|
||||
fi
|
||||
}
|
||||
|
||||
check_url "GITEA_API_URL"
|
||||
check_var "GITEA_TOKEN"
|
||||
check_var "PAGES_HOST"
|
||||
check_url "GIT_PAGES_PUBLISH_URL"
|
||||
check_var "GIT_PAGES_PUBLISH_TOKEN"
|
||||
|
||||
if [ "$ERRORS" -eq 0 ]; then
|
||||
echo "OK: all CI env vars validated"
|
||||
fi
|
||||
|
||||
exit $ERRORS
|
||||
@@ -2,23 +2,20 @@
|
||||
set -euo pipefail
|
||||
|
||||
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 "$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 "${GITEA_API_URL:-}" ] || { echo "ERROR: GITEA_API_URL is not set" >&2; exit 1; }
|
||||
[ -n "${PAGES_HOST:-}" ] || { echo "ERROR: PAGES_HOST is not set" >&2; exit 1; }
|
||||
[ -n "${GIT_PAGES_PUBLISH_URL:-}" ] || { echo "ERROR: GIT_PAGES_PUBLISH_URL is not set" >&2; exit 1; }
|
||||
[ -n "${GIT_PAGES_PUBLISH_TOKEN:-}" ] || { echo "ERROR: GIT_PAGES_PUBLISH_TOKEN is not set" >&2; exit 1; }
|
||||
[ -n "${GITHUB_REPOSITORY:-}" ] || { 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##*/}"
|
||||
OWNER="${GITHUB_REPOSITORY%%/*}"
|
||||
REPO="${GITHUB_REPOSITORY##*/}"
|
||||
SHA8="${GITHUB_SHA:0:8}"
|
||||
REPORT_DIR="reports/${SHA8}/${SUITE_PATH}"
|
||||
PAGES_USER="${GIT_PAGES_PUBLISH_USER:-publish}"
|
||||
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; }
|
||||
@@ -46,7 +43,7 @@ find "$WORK/$OWNER" \( -type f -o -type l \) -print | sed "s|^${WORK}/||" | tar
|
||||
publish() {
|
||||
local method="$1"
|
||||
curl -sS -X "$method" "$PUBLISH_SITE_URL" \
|
||||
-u "${GIT_PAGES_PUBLISH_USER}:${GIT_PAGES_PUBLISH_TOKEN}" \
|
||||
-u "${PAGES_USER}:${GIT_PAGES_PUBLISH_TOKEN}" \
|
||||
-H "Content-Type: application/x-tar" \
|
||||
-H "Atomic: no" \
|
||||
-H "Create-Parents: yes" \
|
||||
|
||||
+7
-13
@@ -2,22 +2,16 @@
|
||||
set -euo pipefail
|
||||
|
||||
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}"
|
||||
|
||||
[ -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; }
|
||||
[ -n "${GITEA_API_URL:-}" ] || { echo "ERROR: GITEA_API_URL is not set" >&2; exit 1; }
|
||||
[ -n "${GITEA_TOKEN:-}" ] || { echo "ERROR: GITEA_TOKEN is not set" >&2; exit 1; }
|
||||
[ -n "${PAGES_HOST:-}" ] || { echo "ERROR: PAGES_HOST is not set" >&2; exit 1; }
|
||||
[ -n "${GIT_PAGES_PUBLISH_URL:-}" ] || { echo "ERROR: GIT_PAGES_PUBLISH_URL is not set" >&2; exit 1; }
|
||||
[ -n "${GIT_PAGES_PUBLISH_TOKEN:-}" ] || { echo "ERROR: GIT_PAGES_PUBLISH_TOKEN is not set" >&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")
|
||||
REPORT_URL=$(bash "$SCRIPT_DIR/publish-git-pages.sh" "$SUITE_PATH")
|
||||
echo "Published: $REPORT_URL"
|
||||
bash "$SCRIPT_DIR/report-status.sh" success "Reports published" "$REPORT_URL" "$GITEA_API_URL" "$GITEA_TOKEN" "ci-report"
|
||||
bash "$SCRIPT_DIR/report-status.sh" success "Reports published" "ci-report"
|
||||
|
||||
+10
-20
@@ -3,33 +3,23 @@ set -euo pipefail
|
||||
|
||||
STATE="${1:-}"
|
||||
DESCRIPTION="${2:-}"
|
||||
URL="${3:-}"
|
||||
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:-}"
|
||||
KEY="${3:-commit-${GITHUB_SHA:0:8}}"
|
||||
SUITE="${4:-}"
|
||||
|
||||
[ -z "$STATE" ] && echo "ERROR: state argument is required" >&2 && exit 1
|
||||
[ -z "$DESCRIPTION" ] && echo "ERROR: description 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
|
||||
[ -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
|
||||
|
||||
if [ -n "$REPORT_PATH" ]; then
|
||||
URL="https://${PAGES_HOST}/${GITHUB_REPOSITORY}/reports/${GITHUB_SHA:0:8}/${REPORT_PATH}"
|
||||
elif [ -n "$PAGES_HOST" ]; then
|
||||
if [ -n "$SUITE" ]; then
|
||||
SUITE="${SUITE%/}/"
|
||||
URL="https://${PAGES_HOST}/${GITHUB_REPOSITORY}/reports/${GITHUB_SHA:0:8}/${SUITE}"
|
||||
else
|
||||
URL="${GITEA_API_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
|
||||
fi
|
||||
|
||||
if [ -n "$ROOT_COMMIT" ] && [ -n "$ROOT_REPO" ]; then
|
||||
REPO="$ROOT_REPO"
|
||||
COMMIT="$ROOT_COMMIT"
|
||||
else
|
||||
REPO="${GITHUB_REPOSITORY:-}"
|
||||
COMMIT="${GITHUB_SHA:-}"
|
||||
fi
|
||||
REPO="${ROOT_REPO:-${GITHUB_REPOSITORY:-}}"
|
||||
COMMIT="${ROOT_COMMIT:-${GITHUB_SHA:-}}"
|
||||
|
||||
[ -z "$REPO" ] && echo "ERROR: GITHUB_REPOSITORY is not set" >&2 && exit 1
|
||||
[ -z "$COMMIT" ] && echo "ERROR: GITHUB_SHA is not set" >&2 && exit 1
|
||||
|
||||
Reference in New Issue
Block a user