Skip to content

Commit

Permalink
build.yml: Consistently use @v4 script versions
Browse files Browse the repository at this point in the history
  • Loading branch information
abraxa committed Aug 25, 2024
1 parent b083a33 commit 4915a93
Showing 1 changed file with 10 additions and 14 deletions.
24 changes: 10 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
DEBUG: 0
# When downloading python from sigrok.org, smth is wrong with the cert
WGET: "wget -c --quiet --no-check-certificate"
ARTIFACT_VERSION: "NIGHTLY"

steps:
- name: Checkout sigrok-build
Expand Down Expand Up @@ -106,7 +107,7 @@ jobs:
- name: Rename artifact
run: |
cd pulseview/build/contrib
mv pulseview-*installer.exe pulseview-NIGHTLY-${{ matrix.target.target }}-${{ matrix.build_type.name }}-installer.exe
mv pulseview-*installer.exe pulseview-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-${{ matrix.build_type.name }}-installer.exe
- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -138,6 +139,7 @@ jobs:
DEBUG: 0
# When downloading python from sigrok.org, smth is wrong with the cert
WGET: "wget -c --quiet --no-check-certificate"
ARTIFACT_VERSION: "NIGHTLY"

steps:
- name: Checkout sigrok-build
Expand Down Expand Up @@ -180,7 +182,7 @@ jobs:
- name: Rename artifact
run: |
cd sigrok-cli/contrib
mv sigrok-cli-*installer.exe sigrok-cli-NIGHTLY-${{ matrix.target.target }}-debug-installer.exe
mv sigrok-cli-*installer.exe sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug-installer.exe
- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -231,8 +233,6 @@ jobs:
ARTIFACT_TITLE: "PulseView"
ARTIFACT_BIN_NAME: "pulseview"
ARTIFACT_VERSION: "NIGHTLY"
# See https://github.com/actions/checkout/issues/1590#issuecomment-2219382750
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

steps:
- name: Update dependencies
Expand All @@ -254,7 +254,7 @@ jobs:
./sigrok-appimage-build-dependencies.sh
- name: Checkout PulseView
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: sigrokproject/pulseview
path: pulseview
Expand Down Expand Up @@ -283,10 +283,10 @@ jobs:
- name: Rename artifact
run: |
cd sigrok-build/ci/appimage/appimage-build
mv PulseView-*.AppImage pulseview-NIGHTLY-${{ matrix.target.target }}-${{ matrix.build_type.name }}.appimage
mv PulseView-*.AppImage pulseview-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-${{ matrix.build_type.name }}.appimage
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifact-pulseview-${{ matrix.target.target }}-appimage
path: sigrok-build/ci/appimage/appimage-build/pulseview-*.appimage
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:
- name: Rename artifact
run: |
cd sigrok-build/ci/appimage/appimage-build
mv sigrok-cli-*.AppImage sigrok-cli-NIGHTLY-${{ matrix.target.target }}-debug.appimage
mv sigrok-cli-*.AppImage sigrok-cli-${{ env.ARTIFACT_VERSION }}-${{ matrix.target.target }}-debug.appimage
- name: Upload artifact
id: upload_sigrok-cli_appimage_artifact
Expand All @@ -387,7 +387,7 @@ jobs:
name: artifact-sigrok-cli-x86_64-appimage
path: sigrok-build/ci/appimage/appimage-build/sigrok-cli-*.appimage

- name: Output artifact URL
- name: Output artifact URL to log
# Only relevant for pull requests
if: (github.event_name == 'pull_request')
run: |
Expand All @@ -399,7 +399,7 @@ jobs:
uses: actions/github-script@v7
env:
PR_NOTES: |
sigrok-cli AppImage created: ${{ steps.upload_sigrok-cli_appimage_artifact.outputs.artifact-url }}
sigrok-cli ${{ matrix.target.target }} AppImage created: ${{ steps.upload_sigrok-cli_appimage_artifact.outputs.artifact-url }}
with:
script: |
github.rest.issues.createComment({
Expand Down Expand Up @@ -572,8 +572,6 @@ jobs:
- build_pulseview_macos

steps:
- name: Download AppImage artifacts
uses: actions/download-artifact@v3
- name: Download all other artifacts
uses: actions/download-artifact@v4
- name: Inspect directory after downloading artifacts
Expand Down Expand Up @@ -611,8 +609,6 @@ jobs:
- build_sigrok-cli_macos

steps:
- name: Download AppImage artifacts
uses: actions/download-artifact@v3
- name: Download all other artifacts
uses: actions/download-artifact@v4
- name: Inspect directory after downloading artifacts
Expand Down

0 comments on commit 4915a93

Please sign in to comment.