From 74d9858c87badac8b156b79625e3127d15fe9383 Mon Sep 17 00:00:00 2001 From: jank Date: Thu, 27 Mar 2025 17:06:17 +0000 Subject: [PATCH 1/6] Update .gitea/workflows/renovate.yaml --- .gitea/workflows/renovate.yaml | 136 +++++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/renovate.yaml b/.gitea/workflows/renovate.yaml index ee0aa4a..a6da2b5 100644 --- a/.gitea/workflows/renovate.yaml +++ b/.gitea/workflows/renovate.yaml @@ -7,41 +7,129 @@ on: push: jobs: - renovate: + discover-repos: + name: Discover Repositories runs-on: ubuntu-latest - # Pin to a specific Renovate version for stability (check ghcr.io for latest) - # Example: ghcr.io/renovatebot/renovate:37.250.0 - container: ghcr.io/renovatebot/renovate:39.219.2 # Pinned version - + container: ghcr.io/renovatebot/renovate:39.219.2 + outputs: + repo-batches: ${{ steps.create-batches.outputs.batches }} + steps: - # Checkout the repository containing config.js - name: Checkout uses: actions/checkout@v4 - - # Cache Renovate's dependency cache directory between runs + - name: Cache Renovate dependencies uses: actions/cache@v4 with: - path: /tmp/renovate-cache # Renovate's default cache directory - # Key based on OS, config file hash, and run ID (ensures save) - key: ${{ runner.os }}-renovate-${{ hashFiles('config.js') }}-${{ github.run_id }} - # Fallback keys for restoring from previous runs + path: /tmp/renovate-cache + key: ${{ runner.os }}-renovate-discovery-${{ hashFiles('config.js') }}-${{ github.run_id }} restore-keys: | - ${{ runner.os }}-renovate-${{ hashFiles('config.js') }}- - ${{ runner.os }}-renovate- + ${{ runner.os }}-renovate-discovery-${{ hashFiles('config.js') }}- + ${{ runner.os }}-renovate-discovery- + + - name: Discover Repositories + run: | + renovate --write-discovered-repos=/tmp/renovate-repos.json + env: + RENOVATE_CONFIG_FILE: "config.js" + RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} + GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} + LOG_LEVEL: "info" + RENOVATE_CACHE_DIR: /tmp/renovate-cache + RENOVATE_AUTODISCOVER: "true" + + - name: Create Repository Batches + id: create-batches + run: | + # Install jq (not included in Renovate image) + apt-get update && apt-get install -y jq + + # Check if repos file exists + if [ ! -f /tmp/renovate-repos.json ]; then + echo "No repositories discovered or file not created" + echo "batches=[]" >> $GITHUB_OUTPUT + exit 0 + fi + + # Read the JSON array from the input file + json_array=$(cat /tmp/renovate-repos.json) + + # Group repositories into batches of 5 + echo "Creating batches of repositories..." + batches=$(echo "$json_array" | jq -r '.[]' | xargs -n5 | jq -R -s 'split("\n") | map(select(length > 0) | split(" "))' | jq 'del(.[] | select(. == []))' | jq -c .) + + # Set the output for the next job + echo "batches=$batches" >> $GITHUB_OUTPUT + + echo "Created $(echo "$batches" | jq '. | length') batches of repositories" - # Run Renovate using the configuration file + renovate: + name: Run Renovate + needs: discover-repos + runs-on: ubuntu-latest + container: ghcr.io/renovatebot/renovate:39.219.2 + if: ${{ needs.discover-repos.outputs.repo-batches != '[]' }} + strategy: + matrix: + batch: ${{ fromJson(needs.discover-repos.outputs.repo-batches) }} + fail-fast: false + max-parallel: 5 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache Renovate dependencies + uses: actions/cache@v4 + with: + path: /tmp/renovate-cache + key: ${{ runner.os }}-renovate-batch-${{ join(matrix.batch, '-') }}-${{ hashFiles('config.js') }}-${{ github.run_id }} + restore-keys: | + ${{ runner.os }}-renovate-batch-${{ join(matrix.batch, '-') }}-${{ hashFiles('config.js') }}- + ${{ runner.os }}-renovate-batch-${{ join(matrix.batch, '-') }}- + ${{ runner.os }}-renovate- + + - name: Run Renovate on Batch + run: | + # Convert array to comma-separated list + REPOS=$(echo '${{ toJson(matrix.batch) }}' | jq -r 'join(",")') + echo "Processing repositories: $REPOS" + + # Run Renovate on the specific repositories + renovate $REPOS + env: + RENOVATE_CONFIG_FILE: "config.js" + RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} + GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} + LOG_LEVEL: "info" + RENOVATE_CACHE_DIR: /tmp/renovate-cache + + # Fallback job in case no repositories are found or for handling config repositories + renovate-default: + name: Run Renovate (Default) + needs: discover-repos + runs-on: ubuntu-latest + container: ghcr.io/renovatebot/renovate:39.219.2 + if: ${{ needs.discover-repos.outputs.repo-batches == '[]' }} + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache Renovate dependencies + uses: actions/cache@v4 + with: + path: /tmp/renovate-cache + key: ${{ runner.os }}-renovate-default-${{ hashFiles('config.js') }}-${{ github.run_id }} + restore-keys: | + ${{ runner.os }}-renovate-default-${{ hashFiles('config.js') }}- + ${{ runner.os }}-renovate-default- + - name: Run Renovate run: renovate env: - # --- Core Configuration --- - RENOVATE_CONFIG_FILE: "config.js" # Path to your config file - RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} # Token for Gitea - GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} # Only needed if Renovate MUST access github.com (e.g., for release notes). Remove if not needed. - - # --- Performance & Logging --- - # Use 'info' for normal runs, 'debug' only when troubleshooting + RENOVATE_CONFIG_FILE: "config.js" + RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} + GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} LOG_LEVEL: "info" - # Explicitly tell Renovate where the cache is (matches actions/cache path) RENOVATE_CACHE_DIR: /tmp/renovate-cache - -- 2.45.3 From 576722b60eecde3499c05bae85aacc4db64dfbeb Mon Sep 17 00:00:00 2001 From: jank Date: Thu, 27 Mar 2025 17:07:59 +0000 Subject: [PATCH 2/6] Update .gitea/workflows/renovate.yaml --- .gitea/workflows/renovate.yaml | 61 ++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/.gitea/workflows/renovate.yaml b/.gitea/workflows/renovate.yaml index a6da2b5..19df32b 100644 --- a/.gitea/workflows/renovate.yaml +++ b/.gitea/workflows/renovate.yaml @@ -27,6 +27,10 @@ jobs: ${{ runner.os }}-renovate-discovery-${{ hashFiles('config.js') }}- ${{ runner.os }}-renovate-discovery- + - name: Install jq + run: | + apt-get update && apt-get install -y jq + - name: Discover Repositories run: | renovate --write-discovered-repos=/tmp/renovate-repos.json @@ -41,24 +45,33 @@ jobs: - name: Create Repository Batches id: create-batches run: | - # Install jq (not included in Renovate image) - apt-get update && apt-get install -y jq - - # Check if repos file exists - if [ ! -f /tmp/renovate-repos.json ]; then - echo "No repositories discovered or file not created" + # Check if repos file exists and is not empty + if [ ! -f /tmp/renovate-repos.json ] || [ ! -s /tmp/renovate-repos.json ]; then + echo "No repositories discovered or file not created/empty" echo "batches=[]" >> $GITHUB_OUTPUT exit 0 fi - # Read the JSON array from the input file - json_array=$(cat /tmp/renovate-repos.json) + # Verify the file contains valid JSON + if ! jq empty /tmp/renovate-repos.json 2>/dev/null; then + echo "Invalid JSON in repositories file" + echo "batches=[]" >> $GITHUB_OUTPUT + exit 0 + fi - # Group repositories into batches of 5 + # Read the JSON array and create batches echo "Creating batches of repositories..." - batches=$(echo "$json_array" | jq -r '.[]' | xargs -n5 | jq -R -s 'split("\n") | map(select(length > 0) | split(" "))' | jq 'del(.[] | select(. == []))' | jq -c .) + batches=$(jq -c 'if type == "array" then . else [] end | _nwise(5) | [.[]]' /tmp/renovate-repos.json) - # Set the output for the next job + # Handle empty results + if [ "$batches" = "" ] || [ "$batches" = "null" ]; then + echo "No valid repositories found" + echo "batches=[]" >> $GITHUB_OUTPUT + exit 0 + fi + + # Format as proper JSON array for GitHub Actions output + batches="[$(echo "$batches" | tr '\n' ',' | sed 's/,$//' )]" echo "batches=$batches" >> $GITHUB_OUTPUT echo "Created $(echo "$batches" | jq '. | length') batches of repositories" @@ -83,20 +96,34 @@ jobs: uses: actions/cache@v4 with: path: /tmp/renovate-cache - key: ${{ runner.os }}-renovate-batch-${{ join(matrix.batch, '-') }}-${{ hashFiles('config.js') }}-${{ github.run_id }} + key: ${{ runner.os }}-renovate-batch-${{ github.run_id }} restore-keys: | - ${{ runner.os }}-renovate-batch-${{ join(matrix.batch, '-') }}-${{ hashFiles('config.js') }}- - ${{ runner.os }}-renovate-batch-${{ join(matrix.batch, '-') }}- ${{ runner.os }}-renovate- + - name: Install jq + run: | + apt-get update && apt-get install -y jq + - name: Run Renovate on Batch run: | - # Convert array to comma-separated list - REPOS=$(echo '${{ toJson(matrix.batch) }}' | jq -r 'join(",")') + # Simple processing of batch array without complex jq + REPOS="" + for repo in $(echo '${{ toJson(matrix.batch) }}' | jq -r '.[]'); do + if [ -n "$REPOS" ]; then + REPOS="$REPOS,$repo" + else + REPOS="$repo" + fi + done + echo "Processing repositories: $REPOS" # Run Renovate on the specific repositories - renovate $REPOS + if [ -n "$REPOS" ]; then + renovate $REPOS + else + echo "No repositories to process in this batch" + fi env: RENOVATE_CONFIG_FILE: "config.js" RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} -- 2.45.3 From 9422db0ad372a24a8f2a063d40c3af3b9d6aa060 Mon Sep 17 00:00:00 2001 From: jank Date: Thu, 27 Mar 2025 17:09:07 +0000 Subject: [PATCH 3/6] Update .gitea/workflows/renovate.yaml --- .gitea/workflows/renovate.yaml | 88 ++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/.gitea/workflows/renovate.yaml b/.gitea/workflows/renovate.yaml index 19df32b..2c3311d 100644 --- a/.gitea/workflows/renovate.yaml +++ b/.gitea/workflows/renovate.yaml @@ -27,10 +27,6 @@ jobs: ${{ runner.os }}-renovate-discovery-${{ hashFiles('config.js') }}- ${{ runner.os }}-renovate-discovery- - - name: Install jq - run: | - apt-get update && apt-get install -y jq - - name: Discover Repositories run: | renovate --write-discovered-repos=/tmp/renovate-repos.json @@ -52,29 +48,35 @@ jobs: exit 0 fi - # Verify the file contains valid JSON - if ! jq empty /tmp/renovate-repos.json 2>/dev/null; then - echo "Invalid JSON in repositories file" - echo "batches=[]" >> $GITHUB_OUTPUT - exit 0 - fi - - # Read the JSON array and create batches - echo "Creating batches of repositories..." - batches=$(jq -c 'if type == "array" then . else [] end | _nwise(5) | [.[]]' /tmp/renovate-repos.json) - - # Handle empty results - if [ "$batches" = "" ] || [ "$batches" = "null" ]; then - echo "No valid repositories found" - echo "batches=[]" >> $GITHUB_OUTPUT - exit 0 - fi - - # Format as proper JSON array for GitHub Actions output - batches="[$(echo "$batches" | tr '\n' ',' | sed 's/,$//' )]" - echo "batches=$batches" >> $GITHUB_OUTPUT - - echo "Created $(echo "$batches" | jq '. | length') batches of repositories" + # Use node to process JSON instead of jq (Node.js is already installed in the container) + node -e ' + const fs = require("fs"); + try { + const data = fs.readFileSync("/tmp/renovate-repos.json", "utf8"); + let repos = []; + try { + repos = JSON.parse(data); + if (!Array.isArray(repos)) { + repos = []; + } + } catch (e) { + console.error("Invalid JSON:", e.message); + } + + // Create batches of 5 repos + const batches = []; + for (let i = 0; i < repos.length; i += 5) { + batches.push(repos.slice(i, i + 5)); + } + + console.log(`Created ${batches.length} batches of repositories`); + // Output for GitHub Actions + fs.writeFileSync(process.env.GITHUB_OUTPUT, `batches=${JSON.stringify(batches)}\n`, {flag: "a"}); + } catch (e) { + console.error("Error processing repositories:", e.message); + fs.writeFileSync(process.env.GITHUB_OUTPUT, "batches=[]\n", {flag: "a"}); + } + ' renovate: name: Run Renovate @@ -100,31 +102,33 @@ jobs: restore-keys: | ${{ runner.os }}-renovate- - - name: Install jq - run: | - apt-get update && apt-get install -y jq - - name: Run Renovate on Batch run: | - # Simple processing of batch array without complex jq - REPOS="" - for repo in $(echo '${{ toJson(matrix.batch) }}' | jq -r '.[]'); do - if [ -n "$REPOS" ]; then - REPOS="$REPOS,$repo" - else - REPOS="$repo" - fi - done + # Use node to process the batch and generate comma-separated repo list + node -e ' + const batch = JSON.parse(process.argv[1]); + if (batch && batch.length > 0) { + const repoList = batch.join(","); + console.log(`Processing repositories: ${repoList}`); + console.log(`::set-output name=repo_list::${repoList}`); + } else { + console.log("No repositories to process in this batch"); + console.log("::set-output name=repo_list::"); + } + ' '${{ toJson(matrix.batch) }}' - echo "Processing repositories: $REPOS" + # Get the repo list from the node script output + REPOS=$(node -e 'console.log(process.env.BATCH_JSON ? JSON.parse(process.env.BATCH_JSON).join(",") : "")' ) - # Run Renovate on the specific repositories + # Run Renovate on the specific repositories if any were found if [ -n "$REPOS" ]; then + echo "Processing: $REPOS" renovate $REPOS else echo "No repositories to process in this batch" fi env: + BATCH_JSON: ${{ toJson(matrix.batch) }} RENOVATE_CONFIG_FILE: "config.js" RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} -- 2.45.3 From ab242fb0e63204d7f9c4df8aea73d86721a69f59 Mon Sep 17 00:00:00 2001 From: jank Date: Thu, 27 Mar 2025 17:10:42 +0000 Subject: [PATCH 4/6] Update .gitea/workflows/renovate.yaml --- .gitea/workflows/renovate.yaml | 126 +++++++++++++++++---------------- 1 file changed, 65 insertions(+), 61 deletions(-) diff --git a/.gitea/workflows/renovate.yaml b/.gitea/workflows/renovate.yaml index 2c3311d..47f523c 100644 --- a/.gitea/workflows/renovate.yaml +++ b/.gitea/workflows/renovate.yaml @@ -10,7 +10,6 @@ jobs: discover-repos: name: Discover Repositories runs-on: ubuntu-latest - container: ghcr.io/renovatebot/renovate:39.219.2 outputs: repo-batches: ${{ steps.create-batches.outputs.batches }} @@ -18,71 +17,64 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Cache Renovate dependencies - uses: actions/cache@v4 + - name: Setup Renovate + uses: renovatebot/github-action@v39.221.0 with: - path: /tmp/renovate-cache - key: ${{ runner.os }}-renovate-discovery-${{ hashFiles('config.js') }}-${{ github.run_id }} - restore-keys: | - ${{ runner.os }}-renovate-discovery-${{ hashFiles('config.js') }}- - ${{ runner.os }}-renovate-discovery- + configurationFile: config.js + token: ${{ secrets.RENOVATE_TOKEN }} - name: Discover Repositories run: | - renovate --write-discovered-repos=/tmp/renovate-repos.json + renovate --write-discovered-repos=renovate-repos.json env: RENOVATE_CONFIG_FILE: "config.js" RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} LOG_LEVEL: "info" - RENOVATE_CACHE_DIR: /tmp/renovate-cache RENOVATE_AUTODISCOVER: "true" - name: Create Repository Batches id: create-batches + shell: bash run: | - # Check if repos file exists and is not empty - if [ ! -f /tmp/renovate-repos.json ] || [ ! -s /tmp/renovate-repos.json ]; then - echo "No repositories discovered or file not created/empty" + if [ ! -f renovate-repos.json ] || [ ! -s renovate-repos.json ]; then + echo "No repositories discovered or file not created" echo "batches=[]" >> $GITHUB_OUTPUT exit 0 fi - # Use node to process JSON instead of jq (Node.js is already installed in the container) - node -e ' - const fs = require("fs"); - try { - const data = fs.readFileSync("/tmp/renovate-repos.json", "utf8"); - let repos = []; - try { - repos = JSON.parse(data); - if (!Array.isArray(repos)) { - repos = []; - } - } catch (e) { - console.error("Invalid JSON:", e.message); - } + # Read repositories and create batches of 5 + REPOS=$(cat renovate-repos.json) + + # Use Python (available in GitHub Actions runner) for JSON processing + BATCHES=$(python3 -c ' + import json + import sys + + try: + data = json.loads(sys.argv[1]) + if not isinstance(data, list): + print("[]") + sys.exit(0) - // Create batches of 5 repos - const batches = []; - for (let i = 0; i < repos.length; i += 5) { - batches.push(repos.slice(i, i + 5)); - } + # Create batches of 5 + batches = [] + for i in range(0, len(data), 5): + batches.append(data[i:i+5]) - console.log(`Created ${batches.length} batches of repositories`); - // Output for GitHub Actions - fs.writeFileSync(process.env.GITHUB_OUTPUT, `batches=${JSON.stringify(batches)}\n`, {flag: "a"}); - } catch (e) { - console.error("Error processing repositories:", e.message); - fs.writeFileSync(process.env.GITHUB_OUTPUT, "batches=[]\n", {flag: "a"}); - } - ' + print(json.dumps(batches)) + except Exception as e: + print(f"Error: {e}", file=sys.stderr) + print("[]") + ' "$REPOS") + + echo "Created batches: $BATCHES" + echo "batches=$BATCHES" >> $GITHUB_OUTPUT renovate: name: Run Renovate needs: discover-repos runs-on: ubuntu-latest - container: ghcr.io/renovatebot/renovate:39.219.2 if: ${{ needs.discover-repos.outputs.repo-batches != '[]' }} strategy: matrix: @@ -94,6 +86,12 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Setup Renovate + uses: renovatebot/github-action@v39.221.0 + with: + configurationFile: config.js + token: ${{ secrets.RENOVATE_TOKEN }} + - name: Cache Renovate dependencies uses: actions/cache@v4 with: @@ -103,50 +101,56 @@ jobs: ${{ runner.os }}-renovate- - name: Run Renovate on Batch + shell: bash run: | - # Use node to process the batch and generate comma-separated repo list - node -e ' - const batch = JSON.parse(process.argv[1]); - if (batch && batch.length > 0) { - const repoList = batch.join(","); - console.log(`Processing repositories: ${repoList}`); - console.log(`::set-output name=repo_list::${repoList}`); - } else { - console.log("No repositories to process in this batch"); - console.log("::set-output name=repo_list::"); - } - ' '${{ toJson(matrix.batch) }}' + # Simple approach to create comma-separated list + REPOS="" + # Make sure batch is not empty + if [ -n "$BATCH" ] && [ "$BATCH" != "null" ]; then + # Convert JSON array to comma-separated string + REPOS=$(python3 -c ' + import json + import sys + + try: + batch = json.loads(sys.argv[1]) + if isinstance(batch, list) and batch: + print(",".join(batch)) + except Exception as e: + print(f"Error: {e}", file=sys.stderr) + ' "$BATCH") + fi - # Get the repo list from the node script output - REPOS=$(node -e 'console.log(process.env.BATCH_JSON ? JSON.parse(process.env.BATCH_JSON).join(",") : "")' ) - - # Run Renovate on the specific repositories if any were found if [ -n "$REPOS" ]; then - echo "Processing: $REPOS" + echo "Processing repositories: $REPOS" renovate $REPOS else echo "No repositories to process in this batch" fi env: - BATCH_JSON: ${{ toJson(matrix.batch) }} + BATCH: ${{ toJson(matrix.batch) }} RENOVATE_CONFIG_FILE: "config.js" RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} LOG_LEVEL: "info" RENOVATE_CACHE_DIR: /tmp/renovate-cache - # Fallback job in case no repositories are found or for handling config repositories renovate-default: name: Run Renovate (Default) needs: discover-repos runs-on: ubuntu-latest - container: ghcr.io/renovatebot/renovate:39.219.2 if: ${{ needs.discover-repos.outputs.repo-batches == '[]' }} steps: - name: Checkout uses: actions/checkout@v4 + - name: Setup Renovate + uses: renovatebot/github-action@v39.221.0 + with: + configurationFile: config.js + token: ${{ secrets.RENOVATE_TOKEN }} + - name: Cache Renovate dependencies uses: actions/cache@v4 with: -- 2.45.3 From 2b469d47c33d4e2c78e4fb86c24c07dbe60d9444 Mon Sep 17 00:00:00 2001 From: jank Date: Thu, 27 Mar 2025 17:12:04 +0000 Subject: [PATCH 5/6] Update .gitea/workflows/renovate.yaml --- .gitea/workflows/renovate.yaml | 157 +++++++++++++++++---------------- 1 file changed, 80 insertions(+), 77 deletions(-) diff --git a/.gitea/workflows/renovate.yaml b/.gitea/workflows/renovate.yaml index 47f523c..70bcbbd 100644 --- a/.gitea/workflows/renovate.yaml +++ b/.gitea/workflows/renovate.yaml @@ -17,11 +17,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup Renovate - uses: renovatebot/github-action@v39.221.0 - with: - configurationFile: config.js - token: ${{ secrets.RENOVATE_TOKEN }} + - name: Install Renovate + run: | + npm install -g renovate - name: Discover Repositories run: | @@ -35,7 +33,6 @@ jobs: - name: Create Repository Batches id: create-batches - shell: bash run: | if [ ! -f renovate-repos.json ] || [ ! -s renovate-repos.json ]; then echo "No repositories discovered or file not created" @@ -43,33 +40,54 @@ jobs: exit 0 fi - # Read repositories and create batches of 5 - REPOS=$(cat renovate-repos.json) + # Install jq if not available + if ! command -v jq &> /dev/null; then + sudo apt-get update && sudo apt-get install -y jq + fi - # Use Python (available in GitHub Actions runner) for JSON processing - BATCHES=$(python3 -c ' - import json - import sys + # Check if file contains valid JSON + if ! jq . renovate-repos.json > /dev/null 2>&1; then + echo "File does not contain valid JSON" + echo "batches=[]" >> $GITHUB_OUTPUT + exit 0 + fi - try: - data = json.loads(sys.argv[1]) - if not isinstance(data, list): - print("[]") - sys.exit(0) - - # Create batches of 5 - batches = [] - for i in range(0, len(data), 5): - batches.append(data[i:i+5]) - - print(json.dumps(batches)) - except Exception as e: - print(f"Error: {e}", file=sys.stderr) - print("[]") - ' "$REPOS") + # Create batches using shell commands + REPO_COUNT=$(jq '. | length' renovate-repos.json) + if [ "$REPO_COUNT" -eq 0 ]; then + echo "No repositories found" + echo "batches=[]" >> $GITHUB_OUTPUT + exit 0 + fi + + echo "Found $REPO_COUNT repositories" + + # Create batches of 5 repos + BATCHES="[" + for i in $(seq 0 5 $((REPO_COUNT-1))); do + if [ "$i" -gt 0 ]; then + BATCHES="$BATCHES," + fi + + # Create a batch of up to 5 repos + BATCH="[" + for j in $(seq 0 4); do + IDX=$((i+j)) + if [ "$IDX" -lt "$REPO_COUNT" ]; then + if [ "$j" -gt 0 ]; then + BATCH="$BATCH," + fi + REPO=$(jq -r ".[$IDX]" renovate-repos.json) + BATCH="$BATCH\"$REPO\"" + fi + done + BATCH="$BATCH]" + BATCHES="$BATCHES$BATCH" + done + BATCHES="$BATCHES]" - echo "Created batches: $BATCHES" echo "batches=$BATCHES" >> $GITHUB_OUTPUT + echo "Created $(echo "$BATCHES" | jq '. | length') batches" renovate: name: Run Renovate @@ -86,41 +104,39 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup Renovate - uses: renovatebot/github-action@v39.221.0 - with: - configurationFile: config.js - token: ${{ secrets.RENOVATE_TOKEN }} - - - name: Cache Renovate dependencies - uses: actions/cache@v4 - with: - path: /tmp/renovate-cache - key: ${{ runner.os }}-renovate-batch-${{ github.run_id }} - restore-keys: | - ${{ runner.os }}-renovate- + - name: Install Renovate + run: | + npm install -g renovate - name: Run Renovate on Batch - shell: bash run: | - # Simple approach to create comma-separated list - REPOS="" - # Make sure batch is not empty - if [ -n "$BATCH" ] && [ "$BATCH" != "null" ]; then - # Convert JSON array to comma-separated string - REPOS=$(python3 -c ' - import json - import sys - - try: - batch = json.loads(sys.argv[1]) - if isinstance(batch, list) and batch: - print(",".join(batch)) - except Exception as e: - print(f"Error: {e}", file=sys.stderr) - ' "$BATCH") + # Convert batch to string and process safely + BATCH='${{ toJson(matrix.batch) }}' + + # Check if batch is valid + if [ "$BATCH" = "null" ] || [ "$BATCH" = "" ]; then + echo "Batch is empty or null" + exit 0 fi + # Parse batch and run Renovate + REPOS="" + # Parse JSON array using bash + BATCH=${BATCH//\[/} + BATCH=${BATCH//\]/} + BATCH=${BATCH//\"/} + BATCH=${BATCH//,/ } + + for REPO in $BATCH; do + if [ -n "$REPO" ]; then + if [ -n "$REPOS" ]; then + REPOS="$REPOS,$REPO" + else + REPOS="$REPO" + fi + fi + done + if [ -n "$REPOS" ]; then echo "Processing repositories: $REPOS" renovate $REPOS @@ -128,12 +144,10 @@ jobs: echo "No repositories to process in this batch" fi env: - BATCH: ${{ toJson(matrix.batch) }} RENOVATE_CONFIG_FILE: "config.js" RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} LOG_LEVEL: "info" - RENOVATE_CACHE_DIR: /tmp/renovate-cache renovate-default: name: Run Renovate (Default) @@ -145,26 +159,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup Renovate - uses: renovatebot/github-action@v39.221.0 - with: - configurationFile: config.js - token: ${{ secrets.RENOVATE_TOKEN }} - - - name: Cache Renovate dependencies - uses: actions/cache@v4 - with: - path: /tmp/renovate-cache - key: ${{ runner.os }}-renovate-default-${{ hashFiles('config.js') }}-${{ github.run_id }} - restore-keys: | - ${{ runner.os }}-renovate-default-${{ hashFiles('config.js') }}- - ${{ runner.os }}-renovate-default- + - name: Install Renovate + run: | + npm install -g renovate - name: Run Renovate - run: renovate + run: | + renovate env: RENOVATE_CONFIG_FILE: "config.js" RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} LOG_LEVEL: "info" - RENOVATE_CACHE_DIR: /tmp/renovate-cache -- 2.45.3 From 011e8bf6a5f3f1335afeaff8bb2f32b760b37407 Mon Sep 17 00:00:00 2001 From: jank Date: Thu, 27 Mar 2025 17:27:36 +0000 Subject: [PATCH 6/6] Update .gitea/workflows/renovate.yaml --- .gitea/workflows/renovate.yaml | 215 ++++++++++++--------------------- 1 file changed, 79 insertions(+), 136 deletions(-) diff --git a/.gitea/workflows/renovate.yaml b/.gitea/workflows/renovate.yaml index 70bcbbd..bfc83db 100644 --- a/.gitea/workflows/renovate.yaml +++ b/.gitea/workflows/renovate.yaml @@ -7,164 +7,107 @@ on: push: jobs: - discover-repos: - name: Discover Repositories + renovate: + name: Renovate with Batching runs-on: ubuntu-latest - outputs: - repo-batches: ${{ steps.create-batches.outputs.batches }} steps: - name: Checkout uses: actions/checkout@v4 - - name: Install Renovate + - name: Install Renovate and Dependencies run: | npm install -g renovate - - - name: Discover Repositories - run: | - renovate --write-discovered-repos=renovate-repos.json - env: - RENOVATE_CONFIG_FILE: "config.js" - RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} - GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} - LOG_LEVEL: "info" - RENOVATE_AUTODISCOVER: "true" - - - name: Create Repository Batches - id: create-batches - run: | - if [ ! -f renovate-repos.json ] || [ ! -s renovate-repos.json ]; then - echo "No repositories discovered or file not created" - echo "batches=[]" >> $GITHUB_OUTPUT - exit 0 - fi - - # Install jq if not available if ! command -v jq &> /dev/null; then sudo apt-get update && sudo apt-get install -y jq fi - - # Check if file contains valid JSON - if ! jq . renovate-repos.json > /dev/null 2>&1; then - echo "File does not contain valid JSON" - echo "batches=[]" >> $GITHUB_OUTPUT - exit 0 - fi - - # Create batches using shell commands - REPO_COUNT=$(jq '. | length' renovate-repos.json) - if [ "$REPO_COUNT" -eq 0 ]; then - echo "No repositories found" - echo "batches=[]" >> $GITHUB_OUTPUT - exit 0 - fi - - echo "Found $REPO_COUNT repositories" - - # Create batches of 5 repos - BATCHES="[" - for i in $(seq 0 5 $((REPO_COUNT-1))); do - if [ "$i" -gt 0 ]; then - BATCHES="$BATCHES," - fi - - # Create a batch of up to 5 repos - BATCH="[" - for j in $(seq 0 4); do - IDX=$((i+j)) - if [ "$IDX" -lt "$REPO_COUNT" ]; then - if [ "$j" -gt 0 ]; then - BATCH="$BATCH," - fi - REPO=$(jq -r ".[$IDX]" renovate-repos.json) - BATCH="$BATCH\"$REPO\"" - fi - done - BATCH="$BATCH]" - BATCHES="$BATCHES$BATCH" - done - BATCHES="$BATCHES]" - - echo "batches=$BATCHES" >> $GITHUB_OUTPUT - echo "Created $(echo "$BATCHES" | jq '. | length') batches" - - renovate: - name: Run Renovate - needs: discover-repos - runs-on: ubuntu-latest - if: ${{ needs.discover-repos.outputs.repo-batches != '[]' }} - strategy: - matrix: - batch: ${{ fromJson(needs.discover-repos.outputs.repo-batches) }} - fail-fast: false - max-parallel: 5 - - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Install Renovate + - name: Debug Environment run: | - npm install -g renovate - - - name: Run Renovate on Batch - run: | - # Convert batch to string and process safely - BATCH='${{ toJson(matrix.batch) }}' - - # Check if batch is valid - if [ "$BATCH" = "null" ] || [ "$BATCH" = "" ]; then - echo "Batch is empty or null" - exit 0 - fi - - # Parse batch and run Renovate - REPOS="" - # Parse JSON array using bash - BATCH=${BATCH//\[/} - BATCH=${BATCH//\]/} - BATCH=${BATCH//\"/} - BATCH=${BATCH//,/ } - - for REPO in $BATCH; do - if [ -n "$REPO" ]; then - if [ -n "$REPOS" ]; then - REPOS="$REPOS,$REPO" - else - REPOS="$REPO" - fi - fi - done - - if [ -n "$REPOS" ]; then - echo "Processing repositories: $REPOS" - renovate $REPOS + echo "Node version: $(node --version)" + echo "NPM version: $(npm --version)" + echo "JQ version: $(jq --version)" + echo "Current directory: $(pwd)" + ls -la + echo "Config file contents:" + if [ -f "config.js" ]; then + cat config.js else - echo "No repositories to process in this batch" + echo "Config file not found!" + fi + + - name: Discover Repositories + id: discover + run: | + echo "Starting repository discovery..." + renovate --write-discovered-repos=renovate-repos.json + + if [ -f renovate-repos.json ]; then + echo "Repository discovery results:" + cat renovate-repos.json + + if jq . renovate-repos.json > /dev/null 2>&1; then + echo "Valid JSON file found" + REPO_COUNT=$(jq '. | length' renovate-repos.json) + echo "Found $REPO_COUNT repositories" + + if [ "$REPO_COUNT" -gt 0 ]; then + # Create list of all repos for processing + ALL_REPOS=$(jq -r '. | join(",")' renovate-repos.json) + echo "all_repos=$ALL_REPOS" >> $GITHUB_OUTPUT + echo "All repositories: $ALL_REPOS" + else + echo "No repositories found in autodiscovery" + fi + else + echo "Invalid JSON in renovate-repos.json" + cat renovate-repos.json + fi + else + echo "No repository discovery results file created" fi + env: + RENOVATE_CONFIG_FILE: "config.js" + RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} + GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }} + LOG_LEVEL: "debug" # Set to debug for more information + RENOVATE_AUTODISCOVER: "true" + + - name: Process All Repositories + if: steps.discover.outputs.all_repos != '' + run: | + ALL_REPOS="${{ steps.discover.outputs.all_repos }}" + echo "Processing all repositories: $ALL_REPOS" + + # Process in batches of 5 + IFS=',' read -ra REPO_ARRAY <<< "$ALL_REPOS" + + TOTAL=${#REPO_ARRAY[@]} + echo "Total repositories to process: $TOTAL" + + for ((i=0; i