Skip to content

Commit 4164b4e

Browse files
authored
Merge pull request #5869 from commercialhaskell/fix5868
Fix #5868 Try to repair trigger of steps in workflow
2 parents 7c33f31 + 1f270a3 commit 4164b4e

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

.github/workflows/integration-tests.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ jobs:
157157
permissions:
158158
contents: write
159159
needs:
160+
- configuration
160161
- integration-tests
161162
- linux-arm64
162163
runs-on: ubuntu-latest
@@ -178,13 +179,13 @@ jobs:
178179
name: Windows
179180
path: _release
180181
- name: Download Linux-ARM64 artifact
181-
if: contains(needs.configuration.outputs.runners, 'arm64')
182+
if: needs.configuration.outputs.test-arm64 == 'true'
182183
uses: actions/download-artifact@v3
183184
with:
184185
name: Linux-ARM64
185186
path: _release
186187
- name: Hash and sign assets
187-
if: needs.configuration.outputs.can-sign
188+
if: needs.configuration.outputs.can-sign == 'true'
188189
shell: bash
189190
env:
190191
RELEASE_SIGNING_KEY: ${{ secrets.RELEASE_SIGNING_KEY }}
@@ -196,17 +197,13 @@ jobs:
196197
shasum -a 256 "$asset" >"$asset.sha256"
197198
gpg --digest-algo=sha512 --detach-sig --armor -u 0x575159689BEFB442 "$asset"
198199
done
199-
- name: Set GitHub ref variables
200-
id: github_ref_vars
201-
run: |
202-
echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
203200
- name: Create GitHub release (final)
201+
id: github_release_final
204202
if: "!startsWith(github.ref, 'refs/tags/rc/')"
205203
uses: ncipollo/[email protected]
206204
env:
207205
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
208206
with:
209-
tag: ${{ github.ref }}
210207
body: |
211208
See https://haskellstack.org/ for installation and upgrade instructions.
212209
@@ -220,12 +217,12 @@ jobs:
220217
draft: true
221218
prerelease: false
222219
- name: Create GitHub release (release candidate)
220+
id: github_release_rc
223221
if: "startsWith(github.ref, 'refs/tags/rc/')"
224222
uses: ncipollo/[email protected]
225223
env:
226224
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
227225
with:
228-
tag: ${{ github.ref }}
229226
body: |
230227
**Changes since v[INSERT PREVIOUS VERSION]:**
231228
@@ -239,18 +236,18 @@ jobs:
239236
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
240237
with:
241238
file: "_release/*"
242-
tag_name: ${{ steps.github_ref_vars.outputs.SOURCE_TAG }}
243239
draft: true
244240
prerelease: false
245241
overwrite: true
242+
release_id: ${{ steps.github_release_final.outputs.id }}
246243
- name: Upload assets to GitHub release (release candidate)
247244
if: "startsWith(github.ref, 'refs/tags/rc/')"
248245
uses: xresloader/upload-to-github-release@v1
249246
env:
250247
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
251248
with:
252249
file: "_release/*"
253-
tag_name: ${{ steps.github_ref_vars.outputs.SOURCE_TAG }}
254250
draft: true
255251
prerelease: true
256252
overwrite: true
253+
release_id: ${{ steps.github_release_rc.outputs.id }}

0 commit comments

Comments
 (0)