Skip to content

Commit fb76360

Browse files
fix(ci): treat NEUTRAL/SKIPPED checks as pass in integration syncs (#971)
## Summary - Update host, k8s, and EC2 integration-definitions sync workflows so the merge wait accepts `NEUTRAL` and `SKIPPED` check states in addition to `SUCCESS`. - Prevents auto-merge from timing out when Argo skips `Validate Configs - integration-definitions`. ## Context After creating sync PRs (e.g. coralogix/integration-definitions#1319), the merge step waited up to 10 minutes and failed because: ```bash gh pr checks ... --jq 'all(.[]; .state == "SUCCESS")' --------- Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 0f49d2c commit fb76360

6 files changed

Lines changed: 9 additions & 3 deletions

File tree

.github/workflows/Sync-ec2-integration-definition.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ jobs:
189189
set -euo pipefail
190190
191191
check_status() {
192-
gh pr checks "$branch" --json state --jq 'all(.[]; .state == "SUCCESS")'
192+
# NEUTRAL/SKIPPED = skipped checks (e.g. Validate Configs); treat as pass
193+
gh pr checks "$branch" --json state --jq 'all(.[]; .state == "SUCCESS" or .state == "NEUTRAL" or .state == "SKIPPED")'
193194
}
194195
195196
max_wait_time=$((10 * 60))

.github/workflows/Sync-host-integration-definition.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ jobs:
174174
if: "${{ env.new_version_exist == 'false' }}"
175175
run: |
176176
check_status() {
177-
gh pr checks ${{ env.branch_name }} --json state --jq 'all(.[]; .state == "SUCCESS")'
177+
# NEUTRAL/SKIPPED = skipped checks (e.g. Validate Configs); treat as pass
178+
gh pr checks ${{ env.branch_name }} --json state --jq 'all(.[]; .state == "SUCCESS" or .state == "NEUTRAL" or .state == "SKIPPED")'
178179
}
179180
180181
max_wait_time=$((10 * 60))

.github/workflows/Sync-k8s-integration-definition.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ jobs:
144144
if: "${{env.new_version_exist == 'false' || github.event_name == 'workflow_dispatch'}}"
145145
run: |
146146
check_status() {
147-
gh pr checks ${{ env.branch_name }} --json state --jq 'all(.[]; .state == "SUCCESS")'
147+
# NEUTRAL/SKIPPED = skipped checks (e.g. Validate Configs); treat as pass
148+
gh pr checks ${{ env.branch_name }} --json state --jq 'all(.[]; .state == "SUCCESS" or .state == "NEUTRAL" or .state == "SKIPPED")'
148149
}
149150
150151
# Initialize the timeout variables

otel-linux-standalone/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161

162162
#### Changes from opentelemetry-collector 0.130.15:
163163
- [Fix] Use `syslog_parser` for macOS system log parsing logic.
164+
164165
### v0.0.25 / 2026-04-22
165166

166167
- [Chore] Bump chart dependency to opentelemetry-collector 0.130.14

otel-macos-standalone/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161

162162
#### Changes from opentelemetry-collector 0.130.15:
163163
- [Fix] Use `syslog_parser` for macOS system log parsing logic.
164+
164165
### v0.0.25 / 2026-04-22
165166

166167
- [Chore] Bump chart dependency to opentelemetry-collector 0.130.14

otel-windows-standalone/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161

162162
#### Changes from opentelemetry-collector 0.130.15:
163163
- [Fix] Use `syslog_parser` for macOS system log parsing logic.
164+
164165
### v0.0.25 / 2026-04-22
165166

166167
- [Chore] Bump chart dependency to opentelemetry-collector 0.130.14

0 commit comments

Comments
 (0)