Skip to content

Commit 8b7ad39

Browse files
authored
feat: get deploy actions running in both merge queue and regress (riscv-software-src#920)
Take 2; the first attempt didn't work because the 'dry-run' input isn't in scope when triggered from the merge queue.
1 parent 9cce5fc commit 8b7ad39

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

.github/workflows/merge.yml

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@ env:
1515
SINGULARITY: 1
1616
jobs:
1717
build-reuse-manifest:
18-
if: inputs.dry-run == false
18+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
1919
runs-on: ubuntu-latest
2020

2121
steps:
2222
- uses: actions/checkout@v4
23-
- uses: actions/setup-python@v5
23+
- name: singularity setup
24+
uses: ./.github/actions/singularity-setup
2425
- name: run reuse
2526
run: ./bin/reuse spdx
2627
build-udb-api-doc:
27-
if: inputs.dry-run == false
28+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
2829
runs-on: ubuntu-latest
2930
steps:
3031
- name: Clone Github Repo Action
@@ -34,7 +35,7 @@ jobs:
3435
- name: Generate UDB API Docs
3536
run: ./do gen:udb:api_doc
3637
build-isa-explorer-csr:
37-
if: inputs.dry-run == false
38+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
3839
runs-on: ubuntu-latest
3940
steps:
4041
- name: Clone Github Repo Action
@@ -44,7 +45,7 @@ jobs:
4445
- name: Generate ISA Explorer CSR
4546
run: ./do gen:isa_explorer_browser_csr
4647
build-isa-explorer-ext:
47-
if: inputs.dry-run == false
48+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
4849
runs-on: ubuntu-latest
4950
steps:
5051
- name: Clone Github Repo Action
@@ -54,27 +55,27 @@ jobs:
5455
- name: Generate ISA Explorer Extension
5556
run: ./do gen:isa_explorer_browser_ext
5657
build-isa-explorer-inst:
57-
if: inputs.dry-run == false
58+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
5859
runs-on: ubuntu-latest
5960
steps:
6061
- name: Clone Github Repo Action
6162
uses: actions/checkout@v4
6263
- name: singularity setup
6364
uses: ./.github/actions/singularity-setup
6465
- name: Generate ISA Explorer Instructions
65-
run: ./do gen:isa_explorer_browser_insts
66+
run: ./do gen:isa_explorer_browser_inst
6667
build-isa-explorer-spreadsheet:
67-
if: inputs.dry-run == false
68+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
6869
runs-on: ubuntu-latest
6970
steps:
7071
- name: Clone Github Repo Action
7172
uses: actions/checkout@v4
7273
- name: singularity setup
7374
uses: ./.github/actions/singularity-setup
7475
- name: Generate ISA Explorer Spreadsheet
75-
run: ./do gen:isa_explorer_browser_spreadsheet
76+
run: ./do gen:isa_explorer_spreadsheet
7677
build-html-isa-manual:
77-
if: inputs.dry-run == false
78+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
7879
runs-on: ubuntu-latest
7980
env:
8081
MANUAL_NAME: isa
@@ -87,7 +88,7 @@ jobs:
8788
- name: Generate HTML ISA manual
8889
run: ./do gen:html_manual
8990
build-html-cfg-isa-manual:
90-
if: inputs.dry-run == false
91+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
9192
runs-on: ubuntu-latest
9293
steps:
9394
- name: Clone Github Repo Action
@@ -97,7 +98,7 @@ jobs:
9798
- name: Generate HTML ISA manual for a config
9899
run: ./do gen:html[example_rv64_with_overlay]
99100
build-instruction-appendix:
100-
if: inputs.dry-run == false
101+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
101102
runs-on: ubuntu-latest
102103
steps:
103104
- name: Clone Github Repo Action
@@ -107,7 +108,7 @@ jobs:
107108
- name: Generate instruction appendix
108109
run: ./do gen:instruction_appendix
109110
build-rvi20-profile:
110-
if: inputs.dry-run == false
111+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
111112
runs-on: ubuntu-latest
112113
steps:
113114
- name: Clone Github Repo Action
@@ -117,7 +118,7 @@ jobs:
117118
- name: Generate RVI20
118119
run: ./do gen:profile_release_pdf[RVI20]
119120
build-rva20-profile:
120-
if: inputs.dry-run == false
121+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
121122
runs-on: ubuntu-latest
122123
steps:
123124
- name: Clone Github Repo Action
@@ -127,7 +128,7 @@ jobs:
127128
- name: Generate RVA20
128129
run: ./do gen:profile_release_pdf[RVA20]
129130
build-rva22-profile:
130-
if: inputs.dry-run == false
131+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
131132
runs-on: ubuntu-latest
132133
steps:
133134
- name: Clone Github Repo Action
@@ -137,7 +138,7 @@ jobs:
137138
- name: Generate RVA22
138139
run: ./do gen:profile_release_pdf[RVA22]
139140
build-rva23-profile:
140-
if: inputs.dry-run == false
141+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
141142
runs-on: ubuntu-latest
142143
steps:
143144
- name: Clone Github Repo Action
@@ -147,7 +148,7 @@ jobs:
147148
- name: Generate RVA23
148149
run: ./do gen:profile_release_pdf[RVA23]
149150
build-rvb23-profile:
150-
if: inputs.dry-run == false
151+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
151152
runs-on: ubuntu-latest
152153
steps:
153154
- name: Clone Github Repo Action
@@ -157,7 +158,7 @@ jobs:
157158
- name: Generate RVB23
158159
run: ./do gen:profile_release_pdf[RVB23]
159160
build-ac100-crd:
160-
if: inputs.dry-run == false
161+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
161162
runs-on: ubuntu-latest
162163
steps:
163164
- name: Clone Github Repo Action
@@ -167,7 +168,7 @@ jobs:
167168
- name: Generate AC100 CRD
168169
run: ./do gen:proc_crd_pdf[AC100]
169170
build-ac200-crd:
170-
if: inputs.dry-run == false
171+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
171172
runs-on: ubuntu-latest
172173
steps:
173174
- name: Clone Github Repo Action
@@ -177,7 +178,7 @@ jobs:
177178
- name: Generate AC200 CRD
178179
run: ./do gen:proc_crd_pdf[AC200]
179180
build-mc100-32-crd:
180-
if: inputs.dry-run == false
181+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
181182
runs-on: ubuntu-latest
182183
steps:
183184
- name: Clone Github Repo Action
@@ -187,7 +188,7 @@ jobs:
187188
- name: Generate MC100-32 CRD
188189
run: ./do gen:proc_crd_pdf[MC100-32]
189190
build-mc100-64-crd:
190-
if: inputs.dry-run == false
191+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
191192
runs-on: ubuntu-latest
192193
steps:
193194
- name: Clone Github Repo Action
@@ -197,7 +198,7 @@ jobs:
197198
- name: Generate MC100-64 CRD
198199
run: ./do gen:proc_crd_pdf[MC100-64]
199200
build-mc200-32-crd:
200-
if: inputs.dry-run == false
201+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
201202
runs-on: ubuntu-latest
202203
steps:
203204
- name: Clone Github Repo Action
@@ -207,7 +208,7 @@ jobs:
207208
- name: Generate MC200-32 CRD
208209
run: ./do gen:proc_crd_pdf[MC200-32]
209210
build-mc200-64-crd:
210-
if: inputs.dry-run == false
211+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
211212
runs-on: ubuntu-latest
212213
steps:
213214
- name: Clone Github Repo Action
@@ -217,7 +218,7 @@ jobs:
217218
- name: Generate MC200-64 CRD
218219
run: ./do gen:proc_crd_pdf[MC200-64]
219220
build-mc300-32-crd:
220-
if: inputs.dry-run == false
221+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
221222
runs-on: ubuntu-latest
222223
steps:
223224
- name: Clone Github Repo Action
@@ -227,7 +228,7 @@ jobs:
227228
- name: Generate MC300-32 CRD
228229
run: ./do gen:proc_crd_pdf[MC300-32]
229230
build-mc300-64-crd:
230-
if: inputs.dry-run == false
231+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
231232
runs-on: ubuntu-latest
232233
steps:
233234
- name: Clone Github Repo Action
@@ -237,7 +238,7 @@ jobs:
237238
- name: Generate MC300-64 CRD
238239
run: ./do gen:proc_crd_pdf[MC300-64]
239240
build-mc100-32-ctp:
240-
if: inputs.dry-run == false
241+
if: (github.event_name == 'merge_queue') || (inputs.dry-run == false)
241242
runs-on: ubuntu-latest
242243
steps:
243244
- name: Clone Github Repo Action

0 commit comments

Comments
 (0)