Skip to content

Commit 6251385

Browse files
authored
fix the reusable precommit (#2829)
so it runs on the correct commit sha
1 parent e7015af commit 6251385

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/reusable-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
uses: ./.github/workflows/reusable-integration-test.yml
8282
with:
8383
target-branch: ${{ inputs.target-branch }}
84+
has-integration-label: ${{ contains(github.event.pull_request.labels.*.name, 'ci/integrations') }}
8485
secrets:
8586
PIPELINE_GITHUB_APP_ID: ${{ secrets.PIPELINE_GITHUB_APP_ID }}
8687
PIPELINE_GITHUB_APP_PRIVATE_KEY: ${{ secrets.PIPELINE_GITHUB_APP_PRIVATE_KEY }}

.github/workflows/reusable-integration-test.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ on:
3838
required: false
3939
type: string
4040
default: 'datadog-api-spec'
41+
has-integration-label:
42+
description: 'Whether the calling PR has ci/integrations label'
43+
required: false
44+
type: boolean
45+
default: false
4146
secrets:
4247
PIPELINE_GITHUB_APP_ID:
4348
required: false
@@ -65,7 +70,8 @@ jobs:
6570
!contains(github.event.pull_request.labels.*.name, 'ci/skip') &&
6671
!contains(github.event.pull_request.head.ref, 'datadog-api-spec/test/') &&
6772
contains(github.event.pull_request.labels.*.name, 'ci/integrations')) ||
68-
github.event_name == 'schedule'
73+
github.event_name == 'schedule' ||
74+
(github.event_name == 'workflow_call' && inputs.has-integration-label)
6975
services:
7076
datadog-agent:
7177
image: gcr.io/datadoghq/agent:latest

.github/workflows/reusable-pre-commit.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,21 @@ jobs:
5858
with:
5959
path: ~/.cache/pre-commit
6060
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
61+
- name: Determine pre-commit range
62+
id: commit_range
63+
run: |
64+
FROM_REF=$(git merge-base HEAD origin/master)
65+
echo "from_ref=$FROM_REF" >> $GITHUB_OUTPUT
66+
echo "to_ref=HEAD" >> $GITHUB_OUTPUT
67+
echo "Pre-commit will check from $FROM_REF to HEAD"
6168
- id: pre_commit
6269
name: Run pre-commit
6370
if: github.event.action != 'closed' && github.event.pull_request.merged != true
6471
run: |
6572
pre-commit run --from-ref "${FROM_REF}" --to-ref "${TO_REF}" --show-diff-on-failure --color=always
6673
env:
67-
FROM_REF: ${{ github.event.pull_request.base.sha }}
68-
TO_REF: ${{ github.event.pull_request.head.sha }}
74+
FROM_REF: ${{ steps.commit_range.outputs.from_ref }}
75+
TO_REF: ${{ steps.commit_range.outputs.to_ref }}
6976
- name: Commit changes
7077
if: failure() && inputs.enable-commit-changes && github.event.pull_request.head.repo.full_name == github.repository
7178
run: |-

0 commit comments

Comments
 (0)