@@ -140,42 +140,9 @@ jobs:
140140 python3-psutil
141141 python3-wcwidth
142142 systemd-devel
143- - name : Check out jbaublitz/stratisd
144- if : github.event_name == 'pull_request'
145- id : jbaublitz
146- continue-on-error : true
147- uses : actions/checkout@v4
143+ - uses : stratis-storage/github-actions/github-modify@HEAD
148144 with :
149- repository : jbaublitz/stratisd
150- path : jbaublitz
151- ref : ${{ github.head_ref }}
152- - name : Check out mulkieran/stratisd
153- if : github.event_name == 'pull_request'
154- id : mulkieran
155- continue-on-error : true
156- uses : actions/checkout@v4
157- with :
158- repository : mulkieran/stratisd
159- path : mulkieran
160- ref : ${{ github.head_ref }}
161- - name : Check if both checkouts succeeded
162- if : github.event_name == 'pull_request' && steps.jbaublitz.outcome == 'success' && steps.mulkieran.outcome == 'success'
163- run : |
164- echo "Branch conflict!"
165- exit 1
166- - name : Conditionally make jbaublitz checkout branch the chosen one
167- if : github.event_name == 'pull_request' && steps.jbaublitz.outcome == 'success'
168- run : mv jbaublitz stratisd
169- - name : Conditionally make mulkieran checkout branch the chosen one
170- if : github.event_name == 'pull_request' && steps.mulkieran.outcome == 'success'
171- run : mv mulkieran stratisd
172- - name : Check out stratisd if no alternative branch was checked out
173- if : github.event_name != 'pull_request' || (github.event_name == 'pull_request' && steps.mulkieran.outcome == 'failure' && steps.jbaublitz.outcome == 'failure')
174- uses : actions/checkout@v4
175- with :
176- repository : stratis-storage/stratisd
177- path : stratisd
178- ref : master
145+ repo : stratisd
179146 - name : Print head commit
180147 run : git log --oneline -1
181148 working-directory : stratisd
@@ -237,42 +204,9 @@ jobs:
237204 with :
238205 components : cargo
239206 toolchain : 1.77.0 # LOWEST SUPPORTED RUST TOOLCHAIN
240- - name : Check out jbaublitz/stratisd
241- if : github.event_name == 'pull_request'
242- id : jbaublitz
243- continue-on-error : true
244- uses : actions/checkout@v4
245- with :
246- repository : jbaublitz/stratisd
247- path : jbaublitz
248- ref : ${{ github.head_ref }}
249- - name : Check out mulkieran/stratisd
250- if : github.event_name == 'pull_request'
251- id : mulkieran
252- continue-on-error : true
253- uses : actions/checkout@v4
254- with :
255- repository : mulkieran/stratisd
256- path : mulkieran
257- ref : ${{ github.head_ref }}
258- - name : Check if both checkouts succeeded
259- if : github.event_name == 'pull_request' && steps.jbaublitz.outcome == 'success' && steps.mulkieran.outcome == 'success'
260- run : |
261- echo "Branch conflict!"
262- exit 1
263- - name : Conditionally make jbaublitz checkout branch the chosen one
264- if : github.event_name == 'pull_request' && steps.jbaublitz.outcome == 'success'
265- run : mv jbaublitz stratisd
266- - name : Conditionally make mulkieran checkout branch the chosen one
267- if : github.event_name == 'pull_request' && steps.mulkieran.outcome == 'success'
268- run : mv mulkieran stratisd
269- - name : Check out stratisd if no alternative branch was checked out
270- if : github.event_name != 'pull_request' || (github.event_name == 'pull_request' && steps.mulkieran.outcome == 'failure' && steps.jbaublitz.outcome == 'failure')
271- uses : actions/checkout@v4
207+ - uses : stratis-storage/github-actions/github-modify@HEAD
272208 with :
273- repository : stratis-storage/stratisd
274- path : stratisd
275- ref : master
209+ repo : stratisd
276210 - name : Print head commit
277211 run : git log --oneline -1
278212 working-directory : stratisd
0 commit comments