Skip to content

Commit 70ef6d5

Browse files
silehtclaude
andauthored
ci: use fixture config path in CI and remove scopes from .mergify.yml (#159)
Point CI workflow steps to zfixtures/mergify.yml via mergify_config_path so tests use a dedicated fixture config instead of the repo's .mergify.yml. This allows removing the now-unnecessary scopes section from .mergify.yml. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent fd8ee80 commit 70ef6d5

File tree

3 files changed

+11
-20
lines changed

3 files changed

+11
-20
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,6 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
jobs:
16-
changes:
17-
runs-on: ubuntu-latest
18-
permissions:
19-
contents: read
20-
pull-requests: read
21-
steps:
22-
- uses: actions/checkout@v6.0.2
23-
- uses: Mergifyio/gha-mergify-ci@v14
24-
id: changes
25-
with:
26-
action: scopes
27-
token: ${{ secrets.MERGIFY_TOKEN }}
28-
2916
linters:
3017
timeout-minutes: 5
3118
runs-on: ubuntu-24.04
@@ -91,6 +78,7 @@ jobs:
9178
uses: ./
9279
with:
9380
action: scopes-git-refs
81+
mergify_config_path: zfixtures/mergify.yml
9482

9583
- name: Trying action scopes-upload
9684
id: scopes-upload
@@ -99,13 +87,15 @@ jobs:
9987
action: scopes-upload
10088
token: ${{ secrets.MERGIFY_TOKEN }}
10189
scopes: scope1,scope2
90+
mergify_config_path: zfixtures/mergify.yml
10291

10392
- name: Trying action scopes
10493
id: scopes-detection
10594
uses: ./
10695
with:
10796
action: scopes
10897
token: ${{ secrets.MERGIFY_TOKEN }}
98+
mergify_config_path: zfixtures/mergify.yml
10999

110100
- name: Check scopes
111101
env:
@@ -136,6 +126,7 @@ jobs:
136126
token: fake-valid-token
137127
report_path: zfixtures/*.xml
138128
mergify_api_url: http://localhost:1080
129+
mergify_config_path: zfixtures/mergify.yml
139130

140131
- name: Run action with error scenario ❌
141132
id: error500
@@ -146,6 +137,7 @@ jobs:
146137
token: fake-valid-token
147138
report_path: zfixtures/junit_example.xml
148139
mergify_api_url: http://localhost:1085
140+
mergify_config_path: zfixtures/mergify.yml
149141

150142
- name: Dump mockserver logs
151143
if: always()
@@ -166,11 +158,11 @@ jobs:
166158
with:
167159
action: wait-jobs
168160
jobs: ${{ toJSON(needs) }}
161+
mergify_config_path: zfixtures/mergify.yml
169162

170163
all-greens:
171164
if: ${{ !cancelled() }}
172165
needs:
173-
- changes
174166
- linters
175167
- autodoc
176168
- test-scopes

.mergify.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ shared:
1010
- check-success=all-greens
1111

1212

13-
scopes:
14-
source:
15-
files:
16-
# Used by .github/workflow/ci.yml to test the action
17-
everything: {}
18-
1913
merge_queue:
2014
max_parallel_checks: 5
2115

zfixtures/mergify.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
scopes:
2+
source:
3+
files:
4+
# Used by .github/workflow/ci.yml to test the action
5+
everything: {}

0 commit comments

Comments
 (0)