File tree Expand file tree Collapse file tree 3 files changed +17
-3
lines changed Expand file tree Collapse file tree 3 files changed +17
-3
lines changed Original file line number Diff line number Diff line change 94
94
uses : ./.github/workflows/reusable-integration-test.yml
95
95
with :
96
96
target-branch : ${{ inputs.target-branch }}
97
+ has-integration-label : ${{ contains(github.event.pull_request.labels.*.name, 'ci/integrations') }}
97
98
secrets :
98
99
PIPELINE_GITHUB_APP_ID : ${{ secrets.PIPELINE_GITHUB_APP_ID }}
99
100
PIPELINE_GITHUB_APP_PRIVATE_KEY : ${{ secrets.PIPELINE_GITHUB_APP_PRIVATE_KEY }}
Original file line number Diff line number Diff line change 38
38
required : false
39
39
type : string
40
40
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
41
46
secrets :
42
47
PIPELINE_GITHUB_APP_ID :
43
48
required : false
65
70
!contains(github.event.pull_request.labels.*.name, 'ci/skip') &&
66
71
!contains(github.event.pull_request.head.ref, 'datadog-api-spec/test/') &&
67
72
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)
69
75
services :
70
76
datadog-agent :
71
77
image : gcr.io/datadoghq/agent:latest
Original file line number Diff line number Diff line change @@ -64,15 +64,22 @@ jobs:
64
64
java-version : " 16"
65
65
distribution : " temurin"
66
66
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"
67
74
- id : pre_commit
68
75
name : Run pre-commit
69
76
if : github.event.action != 'closed' && github.event.pull_request.merged != true
70
77
run : |
71
78
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
72
79
pre-commit run --verbose --from-ref "${FROM_REF}" --to-ref "${TO_REF}" --show-diff-on-failure --color=always
73
80
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 }}
76
83
- name : Commit changes
77
84
if : failure() && inputs.enable-commit-changes && github.event.pull_request.head.repo.full_name == github.repository
78
85
run : |-
You can’t perform that action at this time.
0 commit comments