From f606df34dd094f18a212e0ea3615d6c9e198aa0f Mon Sep 17 00:00:00 2001 From: Adam Daley Date: Wed, 22 Nov 2023 15:36:58 +0000 Subject: [PATCH] Update workflows to run on renovate branches --- .github/renovate.json | 1 - .github/workflows/codeql.yml | 4 +++- .github/workflows/dependency-review.yml | 10 +++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 7a307aa..9dda545 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,7 +2,6 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:recommended", - "schedule:automergeDaily", "schedule:weekly", ":automergeDigest", ":automergeLinters", diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f1b391c..db30b75 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,7 +13,9 @@ name: "CodeQL" on: push: - branches: [ "main" ] + branches: + - 'main' + - 'renovate/**' pull_request: # The branches below must be a subset of the branches above branches: [ "main" ] diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 4e75197..349e9ca 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -5,7 +5,12 @@ # Source repository: https://github.com/actions/dependency-review-action # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement name: 'Dependency Review' -on: [pull_request] +on: + push: + branches: + - 'renovate/**' + pull_request: + branches: [ "main" ] permissions: contents: read @@ -18,3 +23,6 @@ jobs: uses: actions/checkout@v4 - name: 'Dependency Review' uses: actions/dependency-review-action@v3 + with: + base-ref: ${{ github.event.pull_request.base.sha || 'main' }} + head-ref: ${{ github.event.pull_request.head.sha || github.ref }} \ No newline at end of file