Skip to content

Commit

Permalink
Allow CI workflows to run from merge queue (#6719)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- Part of #6712

## Description of the changes
- replicate changes from jaeger-ui to jaeger ci-workflow for enabling
merge queue feature

## How was this change tested?
- make  lint 

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: danish9039 <[email protected]>
Signed-off-by: hippie-danish <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
  • Loading branch information
danish9039 and yurishkuro authored Feb 13, 2025
1 parent 5182729 commit 4b884bb
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-build-binaries.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build binaries

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-crossdock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: CIT Crossdock

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-docker-all-in-one.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build all-in-one

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-docker-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build docker images

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-docker-hotrod.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: CIT Hotrod

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-e2e-all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: E2E Tests

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-e2e-spm.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Test SPM

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-e2e-tailsampling-processor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Test Tail Sampling Processor

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-lint-checks.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Lint Checks

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-lint-dependabot-config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: dependabot validate

on:
merge_group:
pull_request:
paths:
- '.github/dependabot.yml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-unit-tests-go-tip.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Unit Tests on Go Tip

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-unit-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Unit Tests

on:
merge_group:
push:
branches: [main]

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: "CodeQL"

on:
merge_group:
push:
branches: [main]

Expand All @@ -20,6 +21,8 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
codeql-analyze:
# Run only on pull requests, see https://github.com/github/codeql-action/issues/1537
if: ${{ github.event_name == 'pull_request' }}
name: CodeQL Analyze
runs-on: ubuntu-latest

Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/dco_merge_group.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Fake "DCO check" workflow inspired by https://github.com/onnx/onnx/pull/5398/files.
# The regular DCO check is required, but it does not run from a merge queue and there is
# no way to configure it to run.
name: DCO
on:
merge_group:

permissions:
contents: read
jobs:
DCO:
runs-on: ubuntu-latest
steps:
- run: echo "Fake DCO check to avoid blocking the merge queue"
1 change: 1 addition & 0 deletions .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: FOSSA

on:
merge_group:
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/label-check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Verify PR Label

on:
merge_group:
pull_request:
types:
- opened
Expand Down

0 comments on commit 4b884bb

Please sign in to comment.