From 8391d76c6e47e659ba557bbbe7fb363f44623ea2 Mon Sep 17 00:00:00 2001 From: Jim Campbell Date: Wed, 13 Nov 2024 15:27:00 -0500 Subject: [PATCH 1/5] things work better when workflows are added --- .github/workflows/github-actions-demo.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/github-actions-demo.yml diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml new file mode 100644 index 00000000..441a9046 --- /dev/null +++ b/.github/workflows/github-actions-demo.yml @@ -0,0 +1,17 @@ +name: Renovate +run-name: jimtest-renovate +on: [push] +jobs: + renovate: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.2.2 + - name: Self-hosted Renovate + uses: renovatebot/github-action@v41.0.2 + with: + configurationFile: github>psu-libraries/renovate-presets:drupalSite + renovate-version: 39.8.0 + env: + LOG_LEVEL: DEBUG + From 9387d89e42cc05d97dc8ddc7b9f0bb6e76c84853 Mon Sep 17 00:00:00 2001 From: Jim Campbell Date: Wed, 13 Nov 2024 15:28:08 -0500 Subject: [PATCH 2/5] add token --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 441a9046..e8b000bb 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -12,6 +12,7 @@ jobs: with: configurationFile: github>psu-libraries/renovate-presets:drupalSite renovate-version: 39.8.0 + token: ${{ secrets.RENOVATE_TOKEN }} env: LOG_LEVEL: DEBUG From 8e42d66b25841eb64cf63fc52b9292abd1da3b63 Mon Sep 17 00:00:00 2001 From: Jim Campbell Date: Wed, 13 Nov 2024 15:56:45 -0500 Subject: [PATCH 3/5] renovate.json config file --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index e8b000bb..7af9f792 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -10,7 +10,7 @@ jobs: - name: Self-hosted Renovate uses: renovatebot/github-action@v41.0.2 with: - configurationFile: github>psu-libraries/renovate-presets:drupalSite + configurationFile: renovate.json renovate-version: 39.8.0 token: ${{ secrets.RENOVATE_TOKEN }} env: From 6529e5a6a865f5a44262c7cd10f5856b5d4d1316 Mon Sep 17 00:00:00 2001 From: Jim Campbell Date: Wed, 13 Nov 2024 15:59:48 -0500 Subject: [PATCH 4/5] drupalSite locallly --- drupalSite.json | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ renovate.json | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 drupalSite.json diff --git a/drupalSite.json b/drupalSite.json new file mode 100644 index 00000000..5fe2c3ee --- /dev/null +++ b/drupalSite.json @@ -0,0 +1,63 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "description": "Renovate Presets for PSU Libraries Drupal 10+ sites.", + "extends": [ + "config:recommended", + ":dependencyDashboardApproval" + ], + "labels": ["maintenance"], + "dependencyDashboardApproval": true, + "enabledManagers": [ + "composer", + "docker-compose", + "dockerfile", + "npm", + "regex" + ], + "packageRules": [ + { + "groupName": "Drupal Core Major", + "groupSlug": "drupal-major-update", + "matchManagers": ["composer"], + "matchPackagePatterns": ["^drupal/core-recommended", "^drupal/core-composer-scaffold", "^drupal/core-project-message"], + "matchUpdateTypes": ["major"] + }, + { + "groupName": "Composer Minor & Patch", + "groupSlug": "composer-minor-updates", + "matchManagers": ["composer"], + "matchPackagePatterns": [".*"], + "matchUpdateTypes": ["patch", "minor"] + }, + { + "groupName": "NPM Minor & Patch", + "groupSlug": "npm-minor-updates", + "matchManagers": ["npm"], + "matchPackagePatterns": [".*"], + "matchUpdateTypes": ["patch", "minor"] + }, + { + "groupName": "Harbor k8s Docker Image Updates (automerge)", + "groupSlug": "harbor-k8s-drupal-base-image", + "matchManagers": ["regex"], + "separateMinorPatch": true, + "automerge": true, + "automergeType": "branch", + "ignoreTests": true, + "extends": [ + "schedule:automergeEarlyMondays" + ], + "dependencyDashboardApproval": false + } + ], + "customManagers": [ + { + "customType": "regex", + "fileMatch": ["^Dockerfile$"], + "matchStrings": ["FROM\\s(?harbor\\.k8s\\.libraries\\.psu\\.edu/library/drupal-base-image):(?php-\\d+\\.\\d+\\.\\d+-node-20-v\\d+)"], + "depNameTemplate": "{{depName}}", + "versioningTemplate": "regex:^php-(?\\d+).(?\\d+).(?\\d+)-node-20-v(?\\d+)", + "datasourceTemplate": "docker" + } + ] +} \ No newline at end of file diff --git a/renovate.json b/renovate.json index 0b5b2be9..99c97d9b 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>psu-libraries/renovate-presets:drupalSite" + "github>psu-libraries/jimtest:drupalSite" ] } From 203eaea8520c2e0a6b2c900b285fb0ae1c7790f5 Mon Sep 17 00:00:00 2001 From: Jim Campbell Date: Wed, 13 Nov 2024 16:01:32 -0500 Subject: [PATCH 5/5] drupalSite locallly --- .github/workflows/github-actions-demo.yml | 2 +- renovate.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 7af9f792..2d9d35bb 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -10,7 +10,7 @@ jobs: - name: Self-hosted Renovate uses: renovatebot/github-action@v41.0.2 with: - configurationFile: renovate.json + configurationFile: drupalSite.json renovate-version: 39.8.0 token: ${{ secrets.RENOVATE_TOKEN }} env: diff --git a/renovate.json b/renovate.json index 99c97d9b..0b5b2be9 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>psu-libraries/jimtest:drupalSite" + "github>psu-libraries/renovate-presets:drupalSite" ] }