From 758967e4e608e555f6fdc14f660e4568d0b397f8 Mon Sep 17 00:00:00 2001 From: copilotcoder Date: Thu, 9 Jul 2026 00:24:18 -0400 Subject: [PATCH] Fix E2E frontend probe and remove Renovate config mount dependency --- .gitea/workflows/cicd.yaml | 3 ++- .gitea/workflows/renovate.yml | 48 ++++++++++++----------------------- 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/.gitea/workflows/cicd.yaml b/.gitea/workflows/cicd.yaml index b065729..995e587 100644 --- a/.gitea/workflows/cicd.yaml +++ b/.gitea/workflows/cicd.yaml @@ -2296,6 +2296,7 @@ jobs: DB_PASSWORD="plex_password" DB_URL="postgresql://plex_user:${DB_PASSWORD}@database:5432/plex_playlist" E2E_REPO_DIR="$(mktemp -d)" + FRONTEND_URL_COMPOSE="http://frontend:80" if ! command -v docker >/dev/null 2>&1; then echo "❌ Docker is required" @@ -2618,7 +2619,7 @@ jobs: for i in $(seq 1 30); do frontend_running_count="$(docker compose -p "${COMPOSE_PROJECT_NAME}" -f "${COMPOSE_FILE}" ps --status running --services frontend | wc -l)" if [ "${frontend_running_count}" -gt 0 ]; then - frontend_root_code="$(fetch_http "frontend" "/" /tmp/e2e-frontend-root.html 80)" + frontend_root_code="$(fetch_url_from_backend "${FRONTEND_URL_COMPOSE}" /tmp/e2e-frontend-root.html)" case "${frontend_root_code}" in 2*|3*) frontend_ready=true diff --git a/.gitea/workflows/renovate.yml b/.gitea/workflows/renovate.yml index e9cfb7f..66128eb 100644 --- a/.gitea/workflows/renovate.yml +++ b/.gitea/workflows/renovate.yml @@ -62,30 +62,7 @@ jobs: - name: Configure Renovate for Gitea run: | echo "=== Configuring Renovate for Gitea ===" - - CONFIG_DIR="${RUNNER_TEMP:-/tmp}/renovate-config" - CONFIG_FILE="${CONFIG_DIR}/renovate-config.js" - mkdir -p "${CONFIG_DIR}" - - # Renovate reads RENOVATE_TOKEN, RENOVATE_PLATFORM, RENOVATE_ENDPOINT, - # and RENOVATE_GIT_AUTHOR directly from the environment at runtime. - # Keeping the config file minimal avoids repeated migration warnings. - cat > "${CONFIG_FILE}" << 'EOF' - module.exports = { - platform: 'gitea', - endpoint: 'https://dogar.darkhelm.org/api/v1', - gitAuthor: 'Renovate Bot ', - repositories: ['DarkHelm.org/plex-playlist'], - onboarding: false, - requireConfig: 'required', - extends: ['local>DarkHelm.org/plex-playlist'], - prConcurrentLimit: 3, - branchConcurrentLimit: 5, - }; - EOF - - echo "RENOVATE_CONFIG_FILE_HOST=${CONFIG_FILE}" >> "$GITHUB_ENV" - echo "✓ Renovate configuration created" + echo "✓ Renovate runtime configuration will be passed through environment and CLI flags" - name: Run Renovate env: @@ -94,10 +71,14 @@ jobs: ACTIONS_TRIGGER_TOKEN: ${{ secrets.ACTIONS_TRIGGER_TOKEN }} PACKAGE_ACCESS_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} RENOVATE_DRY_RUN: ${{ inputs.dry_run }} - RENOVATE_CONFIG_FILE: /renovate-config/renovate-config.js RENOVATE_PLATFORM: gitea RENOVATE_ENDPOINT: https://dogar.darkhelm.org RENOVATE_ALLOW_INSECURE_TLS: "true" + RENOVATE_GIT_AUTHOR: Renovate Bot + RENOVATE_ONBOARDING: "false" + RENOVATE_REQUIRE_CONFIG: required + RENOVATE_PR_CONCURRENT_LIMIT: "3" + RENOVATE_BRANCH_CONCURRENT_LIMIT: "5" LOG_LEVEL: info run: | echo "=== Running Renovate Bot ===" @@ -189,23 +170,26 @@ jobs: unset RENOVATE_DRY_RUN fi - if [ ! -f "${RENOVATE_CONFIG_FILE_HOST:-}" ]; then - echo "❌ Renovate config file missing on host: ${RENOVATE_CONFIG_FILE_HOST:-unset}" - exit 1 - fi - docker run --rm \ - -v "$(dirname "${RENOVATE_CONFIG_FILE_HOST}"):/renovate-config:ro" \ -e LOG_LEVEL \ -e NODE_TLS_REJECT_UNAUTHORIZED \ -e RENOVATE_TOKEN \ -e RENOVATE_PLATFORM \ -e RENOVATE_ENDPOINT \ -e RENOVATE_DRY_RUN \ - -e RENOVATE_CONFIG_FILE \ + -e RENOVATE_GIT_AUTHOR \ + -e RENOVATE_ONBOARDING \ + -e RENOVATE_REQUIRE_CONFIG \ + -e RENOVATE_PR_CONCURRENT_LIMIT \ + -e RENOVATE_BRANCH_CONCURRENT_LIMIT \ "${RENOVATE_IMAGE}" \ --platform "${RENOVATE_PLATFORM}" \ --endpoint "${RENOVATE_ENDPOINT}" \ + --git-author "${RENOVATE_GIT_AUTHOR}" \ + --onboarding="${RENOVATE_ONBOARDING}" \ + --require-config "${RENOVATE_REQUIRE_CONFIG}" \ + --pr-concurrent-limit "${RENOVATE_PR_CONCURRENT_LIMIT}" \ + --branch-concurrent-limit "${RENOVATE_BRANCH_CONCURRENT_LIMIT}" \ DarkHelm.org/plex-playlist | tee /tmp/renovate.log echo "✓ Renovate execution completed"