Skip to content

Commit cc2f8fa

Browse files
committed
Fix release action conditions (#23)
1 parent f4df9e0 commit cc2f8fa

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
branches: ['main']
77

88
jobs:
9-
109
generate-matrix:
1110
name: 'Generate matrix from cabal'
1211
outputs:
@@ -218,7 +217,9 @@ jobs:
218217
path: ${{ env.PRINTAPI_EXEC_TAR }}
219218

220219
collect-test-results:
220+
name: Collect test results
221221
runs-on: ubuntu-latest
222+
needs: ['builds', 'build-alpine']
222223
steps:
223224
- name: Install junitparser
224225
run: |
@@ -252,9 +253,8 @@ jobs:
252253
merge-multiple: true
253254
path: ./out
254255

255-
- name: Release
256+
- name: Pre-release
256257
uses: softprops/action-gh-release@v2
257-
if: startsWith(github.ref, 'refs/tags/')
258258
with:
259259
prerelease: true
260260
files: ./out/*

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- "v*"
88

99
jobs:
10-
1110
generate-matrix:
11+
if: startsWith(github.ref, 'refs/tags/v')
1212
name: 'Generate matrix from cabal'
1313
outputs:
1414
matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -24,6 +24,7 @@ jobs:
2424
version: 0.1.7.1
2525

2626
generate-alpine-matrix:
27+
if: startsWith(github.ref, 'refs/tags/v')
2728
name: 'Generate Alpine matrix from cabal'
2829
outputs:
2930
matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -251,6 +252,6 @@ jobs:
251252
- name: Release
252253
uses: softprops/action-gh-release@v2
253254
with:
254-
prerelease: ${{ startsWith(github.ref, 'refs/tags/v') }}
255+
prerelease: true
255256
draft: true
256257
files: ./release/*

.github/workflows/test-reports.yml

Whitespace-only changes.

0 commit comments

Comments
 (0)