Skip to content

Commit 04f4399

Browse files
abraxaabraxa
committedAug 28, 2024·
build.yml: Fix table layout
1 parent 0da4f76 commit 04f4399

File tree

1 file changed

+19
-23
lines changed

1 file changed

+19
-23
lines changed
 

‎.github/workflows/build.yml

+19-23
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Set artifact version to PR
6969
if: (github.event_name == 'pull_request')
7070
run: |
71-
echo "ARTIFACT_VERSION=PR${{ github.event.pull_request.number }}" >> $GITHUB_ENV
71+
echo "ARTIFACT_VERSION=pr${{ github.event.pull_request.number }}" >> $GITHUB_ENV
7272
7373
- name: Checkout sigrok-build
7474
# Cannot use actions/checkout because it always checks out the calling actions' repo, not the one specified
@@ -141,7 +141,7 @@ jobs:
141141
# Only relevant for pull requests
142142
if: (github.event_name == 'pull_request')
143143
run: |
144-
echo "PR_LINKS=\" | pulseview-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-${{ matrix.build_type.name }}-installer.exe | ${{ steps.upload.outputs.artifact-url }}\"" >> $GITHUB_OUTPUT
144+
echo "PR_LINKS=\" | pulseview-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-${{ matrix.build_type.name }}-installer.exe | ${{ steps.upload.outputs.artifact-url }} |\"" >> $GITHUB_OUTPUT
145145
146146
147147
build_sigrok-cli_mxe:
@@ -176,7 +176,7 @@ jobs:
176176
- name: Set artifact version to PR
177177
if: (github.event_name == 'pull_request')
178178
run: |
179-
echo "ARTIFACT_VERSION=PR${{ github.event.pull_request.number }}" >> $GITHUB_ENV
179+
echo "ARTIFACT_VERSION=pr${{ github.event.pull_request.number }}" >> $GITHUB_ENV
180180
181181
- name: Checkout sigrok-build
182182
# Cannot use actions/checkout because it always checks out the calling actions' repo, not the one specified
@@ -244,7 +244,7 @@ jobs:
244244
# Only relevant for pull requests
245245
if: (github.event_name == 'pull_request')
246246
run: |
247-
echo "PR_LINKS=\" | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug-installer.exe | ${{ steps.upload.outputs.artifact-url }}\"" >> $GITHUB_OUTPUT
247+
echo "PR_LINKS=\" | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug-installer.exe | ${{ steps.upload.outputs.artifact-url }} |\"" >> $GITHUB_OUTPUT
248248
249249
250250
build_pulseview_appimage:
@@ -298,7 +298,7 @@ jobs:
298298
- name: Set artifact version to PR
299299
if: (github.event_name == 'pull_request')
300300
run: |
301-
echo "ARTIFACT_VERSION=PR${{ github.event.pull_request.number }}" >> $GITHUB_ENV
301+
echo "ARTIFACT_VERSION=pr${{ github.event.pull_request.number }}" >> $GITHUB_ENV
302302
303303
- name: Update dependencies
304304
run: |
@@ -374,7 +374,7 @@ jobs:
374374
# Only relevant for pull requests
375375
if: (github.event_name == 'pull_request')
376376
run: |
377-
echo "PR_LINKS=\" | pulseview-${{ matrix.target.target }}-${{ matrix.build_type.name }}-appimage | ${{ steps.upload.outputs.artifact-url }}\"" >> $GITHUB_OUTPUT
377+
echo "PR_LINKS=\" | pulseview-${{ matrix.target.target }}-${{ matrix.build_type.name }}-appimage | ${{ steps.upload.outputs.artifact-url }} |\"" >> $GITHUB_OUTPUT
378378
379379
380380
build_sigrok-cli_appimage:
@@ -424,7 +424,7 @@ jobs:
424424
- name: Set artifact version to PR
425425
if: (github.event_name == 'pull_request')
426426
run: |
427-
echo "ARTIFACT_VERSION=PR${{ github.event.pull_request.number }}" >> $GITHUB_ENV
427+
echo "ARTIFACT_VERSION=pr${{ github.event.pull_request.number }}" >> $GITHUB_ENV
428428
429429
- name: Update dependencies
430430
run: |
@@ -497,7 +497,7 @@ jobs:
497497
# Only relevant for pull requests
498498
if: (github.event_name == 'pull_request')
499499
run: |
500-
echo "PR_LINKS=\" | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug.appimage | ${{ steps.upload.outputs.artifact-url }}\"" >> $GITHUB_OUTPUT
500+
echo "PR_LINKS=\" | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug.appimage | ${{ steps.upload.outputs.artifact-url }} |\"" >> $GITHUB_OUTPUT
501501
502502
503503
build_pulseview_macos:
@@ -532,7 +532,7 @@ jobs:
532532
- name: Set artifact version to PR
533533
if: (github.event_name == 'pull_request')
534534
run: |
535-
echo "ARTIFACT_VERSION=PR${{ github.event.pull_request.number }}" >> $GITHUB_ENV
535+
echo "ARTIFACT_VERSION=pr${{ github.event.pull_request.number }}" >> $GITHUB_ENV
536536
537537
- name: Install dependencies
538538
run: |
@@ -605,7 +605,7 @@ jobs:
605605
# Only relevant for pull requests
606606
if: (github.event_name == 'pull_request')
607607
run: |
608-
echo "PR_LINKS=\" | pulseview-${{ env.ARTIFACT_VERSION }}-${{ env.TARGET }}.dmg | ${{ steps.upload.outputs.artifact-url }}\"" >> $GITHUB_OUTPUT
608+
echo "PR_LINKS=\" | pulseview-${{ env.ARTIFACT_VERSION }}-${{ env.TARGET }}.dmg | ${{ steps.upload.outputs.artifact-url }} |\"" >> $GITHUB_OUTPUT
609609
610610
611611
build_sigrok-cli_macos:
@@ -633,7 +633,7 @@ jobs:
633633
- name: Set artifact version to PR
634634
if: (github.event_name == 'pull_request')
635635
run: |
636-
echo "ARTIFACT_VERSION=PR${{ github.event.pull_request.number }}" >> $GITHUB_ENV
636+
echo "ARTIFACT_VERSION=pr${{ github.event.pull_request.number }}" >> $GITHUB_ENV
637637
638638
- name: Install dependencies
639639
run: |
@@ -697,7 +697,7 @@ jobs:
697697
# Only relevant for pull requests
698698
if: (github.event_name == 'pull_request')
699699
run: |
700-
echo "PR_LINKS=\" | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ env.TARGET }}.dmg | ${{ steps.upload.outputs.artifact-url }}\"" >> $GITHUB_OUTPUT
700+
echo "PR_LINKS=\" | sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ env.TARGET }}.dmg | ${{ steps.upload.outputs.artifact-url }} |\"" >> $GITHUB_OUTPUT
701701
702702
703703
continuous_release_pulseview:
@@ -800,7 +800,7 @@ jobs:
800800
runs-on: ubuntu-latest
801801

802802
needs:
803-
# Keep in sync with job continuous_release_pulseview and see below, too
803+
# Keep in sync with job continuous_release_pulseview
804804
- build_pulseview_mxe
805805
- build_pulseview_appimage
806806
- build_pulseview_macos
@@ -813,10 +813,8 @@ jobs:
813813
## PulseView binaries created
814814
815815
| Build | Link |
816-
---------------------------------------------------
817-
${{ needs.build_pulseview_appimage.outputs.pr_links }}
818-
${{ needs.build_pulseview_mxe.outputs.pr_links }}
819-
${{ needs.build_pulseview_macos.outputs.pr_links }}
816+
| ----- | ---- |
817+
${{ needs.*.outputs.pr_links }}
820818
821819
Note: Binaries are removed after 90 days. If necessary, re-trigger a build by commenting '/build'.
822820
with:
@@ -837,7 +835,7 @@ jobs:
837835
runs-on: ubuntu-latest
838836

839837
needs:
840-
# Keep in sync with job continuous_release_pulseview and see below, too
838+
# Keep in sync with job continuous_release_sigrok-cli
841839
- build_sigrok-cli_mxe
842840
- build_sigrok-cli_appimage
843841
- build_sigrok-cli_macos
@@ -847,13 +845,11 @@ jobs:
847845
uses: actions/github-script@v7
848846
env:
849847
PR_COMMENT: |-
850-
## PulseView binaries created
848+
## sigrok-cli binaries created
851849
852850
| Build | Link |
853-
---------------------------------------------------
854-
${{ needs.build_sigrok-cli_appimage.outputs.pr_links }}
855-
${{ needs.build_sigrok-cli_mxe.outputs.pr_links }}
856-
${{ needs.build_sigrok-cli_macos.outputs.pr_links }}
851+
| ----- | ---- |
852+
${{ needs.*.outputs.pr_links }}
857853
858854
Note: Binaries are removed after 90 days. If necessary, re-trigger a build by commenting '/build'.
859855
with:

0 commit comments

Comments
 (0)
Please sign in to comment.