Skip to content

Commit 5a17363

Browse files
authored
fix the reusable precommit (#3154)
so it runs on the correct commit sha
1 parent 62f3a3b commit 5a17363

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
@@ -94,6 +94,7 @@ jobs:
9494
uses: ./.github/workflows/reusable-integration-test.yml
9595
with:
9696
target-branch: ${{ inputs.target-branch }}
97+
has-integration-label: ${{ contains(github.event.pull_request.labels.*.name, 'ci/integrations') }}
9798
secrets:
9899
PIPELINE_GITHUB_APP_ID: ${{ secrets.PIPELINE_GITHUB_APP_ID }}
99100
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
@@ -64,15 +64,22 @@ jobs:
6464
java-version: "16"
6565
distribution: "temurin"
6666
cache: "maven"
67+
- name: Determine pre-commit range
68+
id: commit_range
69+
run: |
70+
FROM_REF=$(git merge-base HEAD origin/master)
71+
echo "from_ref=$FROM_REF" >> $GITHUB_OUTPUT
72+
echo "to_ref=HEAD" >> $GITHUB_OUTPUT
73+
echo "Pre-commit will check from $FROM_REF to HEAD"
6774
- id: pre_commit
6875
name: Run pre-commit
6976
if: github.event.action != 'closed' && github.event.pull_request.merged != true
7077
run: |
7178
wget https://github.com/google/google-java-format/releases/download/v1.16.0/google-java-format-1.16.0-all-deps.jar -O google-java-format.jar
7279
pre-commit run --verbose --from-ref "${FROM_REF}" --to-ref "${TO_REF}" --show-diff-on-failure --color=always
7380
env:
74-
FROM_REF: ${{ github.event.pull_request.base.sha }}
75-
TO_REF: ${{ github.event.pull_request.head.sha }}
81+
FROM_REF: ${{ steps.commit_range.outputs.from_ref }}
82+
TO_REF: ${{ steps.commit_range.outputs.to_ref }}
7683
- name: Commit changes
7784
if: failure() && inputs.enable-commit-changes && github.event.pull_request.head.repo.full_name == github.repository
7885
run: |-

0 commit comments

Comments
 (0)