Skip to content

Commit

Permalink
[chore] Try tuning some renovate bot things (#29787)
Browse files Browse the repository at this point in the history
Closes
#29784
  • Loading branch information
TylerHelmuth authored Dec 12, 2023
1 parent 97764b9 commit 3844732
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- cmd
- other
runs-on: windows-latest
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push') }}
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push') }}
env:
# Limit memory usage via GC environment variables to avoid OOM on GH runners, especially for `cmd/otelcontribcol`,
# see https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/28682#issuecomment-1802296776
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Run Unit tests
run: make -j2 gotest GROUP=${{ matrix.group }}
windows-unittest:
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push') }}
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push') }}
runs-on: windows-latest
needs: [windows-unittest-matrix]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
setup-environment:
timeout-minutes: 30
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:
jobs:
changelog:
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
env:
PR_HEAD: ${{ github.event.pull_request.head.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
env:
PR_HEAD: ${{ github.event.pull_request.head.sha }}
if: ${{ github.actor != 'dependabot[bot]' }}
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
outputs:
md: ${{ steps.changes.outputs.md }}
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
jobs:
CodeQL-Build:
runs-on: macos-latest
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
env:
# Force CodeQL to run the extraction on the files compiled by our custom
# build command, as opposed to letting the autobuilder figure it out.
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ env:
jobs:
collector-build:
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/load-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
setup-environment:
timeout-minutes: 30
runs-on: self-hosted
if: ${{ github.actor != 'dependabot[bot]' }}
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
outputs:
loadtest_matrix: ${{ steps.splitloadtest.outputs.loadtest_matrix }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prometheus-compliance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
jobs:
prometheus-compliance-tests:
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/telemetrygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:
jobs:
build-dev:
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' }}
steps:
- uses: actions/checkout@v4
- name: Build telemetrygen
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tidy-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
setup-environment:
timeout-minutes: 30
runs-on: ubuntu-latest
if: ${{ contains(github.event.pull_request.labels.*.name, 'renovatebot') }}
if: ${{ github.actor == 'renovate[bot]' || contains(github.event.pull_request.labels.*.name, 'renovatebot') }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
23 changes: 14 additions & 9 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@
"constraints": {
"go": "1.20"
},
"extends": [
"config:base"
],
"schedule": ["every tuesday"],
"extends": ["config:recommended"],
"ignorePaths": [
"**/receiver/apachesparkreceiver/testdata/integration/Dockerfile.apache-spark",
"**/receiver/elasticsearchreceiver/testdata/integration/Dockerfile.elasticsearch.7_16_3",
"**/receiver/elasticsearchreceiver/testdata/integration/Dockerfile.elasticsearch.7_9_3",
"**/receiver/mongodbreceiver/testdata/integration/Dockerfile.mongodb.4_0",
"**/receiver/mongodbreceiver/testdata/integration/Dockerfile.mongodb.4_4.lpu",
"**/receiver/mongodbreceiver/testdata/integration/Dockerfile.mongodb.4_4lpu",
"**/receiver/mongodbreceiver/testdata/integration/Dockerfile.mongodb.5_0"
],
"packageRules": [
Expand All @@ -41,27 +40,32 @@
{
"matchManagers": ["gomod"],
"matchSourceUrlPrefixes": ["https://go.opentelemetry.io/collector"],
"groupName": "All OpenTelemetry Collector packages"
"groupName": "All OpenTelemetry Collector packages",
"matchUpdateTypes": ["major", "minor", "patch"]
},
{
"matchManagers": ["gomod"],
"matchSourceUrlPrefixes": ["https://github.com/aws"],
"groupName": "All github.com/aws packages"
"groupName": "All github.com/aws packages",
"matchUpdateTypes": ["minor", "patch"]
},
{
"matchManagers": ["gomod"],
"matchSourceUrlPrefixes": ["https://github.com/azure"],
"groupName": "All github.com/azure packages"
"groupName": "All github.com/azure packages",
"matchUpdateTypes": ["minor", "patch"]
},
{
"matchManagers": ["gomod"],
"matchSourceUrlPrefixes": ["https://github.com/datadog"],
"groupName": "All github.com/datadog packages"
"groupName": "All github.com/datadog packages",
"matchUpdateTypes": ["minor", "patch"]
},
{
"matchManagers": ["gomod"],
"matchSourceUrlPrefixes": ["https://github.com/googlecloudplatform"],
"groupName": "All github.com/googlecloudplatform packages"
"groupName": "All github.com/googlecloudplatform packages",
"matchUpdateTypes": ["minor", "patch"]
},
{
"matchManagers": ["gomod"],
Expand All @@ -71,5 +75,6 @@
"ignoreDeps": [
"github.com/mattn/go-ieproxy",
"github.com/DataDog/datadog-agent/pkg/trace/exportable"
]
],
"prConcurrentLimit": 50
}

0 comments on commit 3844732

Please sign in to comment.