Skip to content

CI: Replace merge_group with push on 26_2 #36294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexslavr wants to merge 1 commit into
base: 26_2
Choose a base branch
from
+61 −46
Open

CI: Replace merge_group with push on 26_2 #36294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]
workflow_dispatch:

concurrency:
Expand Down Expand Up @@ -106,7 +107,7 @@ jobs:
retention-days: 1

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/default_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches:
- "[0-9][0-9]_[0-9]"

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down Expand Up @@ -114,7 +116,7 @@ jobs:
devextreme-vue-playground

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/demos_unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]
workflow_dispatch:

env:
Expand Down Expand Up @@ -114,7 +115,7 @@ jobs:
run: pnpm exec nx test

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down Expand Up @@ -126,7 +127,7 @@ jobs:
run: pnpm exec nx type-check

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down Expand Up @@ -225,7 +226,7 @@ jobs:
run: pnpm exec nx lint-js

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down Expand Up @@ -318,7 +319,7 @@ jobs:
run: pnpm exec nx lint-texts

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down Expand Up @@ -457,7 +458,7 @@ jobs:
run: pnpm exec nx run-many -t lint -p devextreme-angular devextreme-react devextreme-vue

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/paths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]

env:
MAX_LENGTH: 170
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/playgrounds_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down Expand Up @@ -114,7 +115,7 @@ jobs:
retention-days: 1

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/playwright_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]
workflow_dispatch:

env:
Expand Down Expand Up @@ -113,7 +114,7 @@ jobs:
retention-days: 1

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-storybook-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ jobs:
wait-for-pages-deployment: true

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/qunit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]
workflow_dispatch:

env:
Expand Down Expand Up @@ -127,7 +128,7 @@ jobs:
retention-days: 1

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand All @@ -139,7 +140,7 @@ jobs:

qunit-tests:
needs: build
runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
name: Constel ${{ matrix.CONSTEL }}${{ matrix.TIMEZONE != '' && format('-{0}', matrix.TIMEZONE) || '' }}${{ matrix.CSP == 'false' && '-no-csp' || '' }}
timeout-minutes: 11
strategy:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/renovation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down Expand Up @@ -103,7 +104,7 @@ jobs:
run: pnpm exec nx test-jest devextreme

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/styles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down Expand Up @@ -99,7 +100,7 @@ jobs:
run: pnpm exec nx naming:check devextreme-scss

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/testcafe_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]
workflow_dispatch:

env:
Expand Down Expand Up @@ -63,7 +64,7 @@ jobs:
needs: check-should-run
if: needs.check-should-run.outputs.should-run == 'true'

runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
timeout-minutes: 15

steps:
Expand Down Expand Up @@ -217,7 +218,7 @@ jobs:
retention-days: 1

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down Expand Up @@ -304,7 +305,7 @@ jobs:
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.determine-testcafe-matrix.outputs.matrix) }}
runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
timeout-minutes: 12

steps:
Expand Down Expand Up @@ -472,7 +473,7 @@ jobs:
needs.check-should-run.outputs.should-run == 'true' &&
needs.build.result == 'success' &&
needs.check-quarantine.outputs.should-run != 'false'
runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
timeout-minutes: 8

steps:
Expand Down Expand Up @@ -542,8 +543,8 @@ jobs:
new_flakes_summary=./artifacts/new-flakes-summary.txt
new_flakes=./artifacts/flaky-candidates.jsonl
report_json=./artifacts/flaky-candidates.json
# base_ref is empty for push and merge_group, which carry the target elsewhere.
base_branch="${{ github.base_ref || github.event.merge_group.base_ref || github.ref_name }}"
# base_ref is empty for push, which carries the target in ref_name.
base_branch="${{ github.base_ref || github.ref_name }}"
base_branch="${base_branch#refs/heads/}"
mkdir -p ./artifacts
: > "$new_flakes_summary"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/themebuilder_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]

env:
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
Expand Down Expand Up @@ -120,7 +121,7 @@ jobs:
run: pnpm exec stylelint --config tests/bundles-stylelint-config.json "../devextreme/artifacts/**/dx.material.blue.light.css"

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ts_declarations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]

jobs:
check-ts-bundle:
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/visual-tests-demos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]
workflow_dispatch:

env:
Expand All @@ -28,7 +29,7 @@ jobs:
run: echo "should-run=${{ env.RUN_TESTS }}" >> $GITHUB_OUTPUT

build-devextreme:
runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
name: Build DevExtreme
needs: [check-should-run]
if: |
Expand Down Expand Up @@ -148,7 +149,7 @@ jobs:
retention-days: 1

- name: Save nx cache
if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
if: github.event_name != 'pull_request'
uses: actions/cache/save@v5
with:
path: |
Expand All @@ -159,7 +160,7 @@ jobs:
key: ${{ runner.os }}-nx-v2-${{ github.workflow }}-${{ github.job }}-${{ github.sha }}
build-demos:
name: Build demos
runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
timeout-minutes: 10
needs: [check-should-run, build-devextreme]
if: |
Expand Down Expand Up @@ -415,7 +416,7 @@ jobs:
env:
ACCESSIBILITY_TESTCAFE_REPORT_PATH: "accessibility_testcafe_report"

runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
name: ${{ matrix.CONSTEL }}-${{ matrix.STRATEGY }}-${{ matrix.THEME }}
timeout-minutes: 15

Expand Down Expand Up @@ -583,7 +584,7 @@ jobs:
]
THEME: ['fluent.blue.light', 'fluent-next.blue.light']

runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
name: ${{ matrix.CONSTEL }}-screenshots-${{ matrix.THEME }}
timeout-minutes: 18

Expand Down Expand Up @@ -788,7 +789,7 @@ jobs:
include:
- { SHARD_INDEX: 1, SHARD_TOTAL: 2 }
- { SHARD_INDEX: 2, SHARD_TOTAL: 2 }
runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
timeout-minutes: 20

steps:
Expand Down Expand Up @@ -872,7 +873,7 @@ jobs:
- { FRAMEWORK: Angular, SHARD_INDEX: 1, SHARD_TOTAL: 3 }
- { FRAMEWORK: Angular, SHARD_INDEX: 2, SHARD_TOTAL: 3 }
- { FRAMEWORK: Angular, SHARD_INDEX: 3, SHARD_TOTAL: 3 }
runs-on: ${{ github.event_name == 'merge_group' && 'devextreme-shr2-ondemand' || 'devextreme-shr2' }}
runs-on: devextreme-shr2
timeout-minutes: 16

steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/wrapper_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
paths-ignore:
- 'apps/**/*.md'
merge_group:
push:
branches: [26_2]

concurrency:
group: wf-${{github.event.pull_request.number || github.ref || github.sha}}-${{github.workflow}}
Expand Down
Loading
Loading