Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/setup-no…
Browse files Browse the repository at this point in the history
…de-4
  • Loading branch information
peternewman authored Feb 28, 2024
2 parents 40fc444 + c6e7c58 commit df02c7b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ jobs:
if: always()
run: sha256sum ola-*.tar.gz
- name: Upload source tree artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ola-${{ matrix.id }}-source-tree
path: ola-${{ matrix.id }}-source-tree.tar.gz
- name: Upload built artifact
if: matrix.task == 'distcheck' || matrix.task == 'dist'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ola-${{ matrix.id }}-dist
path: |
Expand All @@ -147,7 +147,7 @@ jobs:
flag-name: ${{ matrix.id }}
- name: Upload coverage artifacts
if: always() && matrix.task == 'coverage'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ola-${{ matrix.id }}-coverage
path: coverage/
Expand All @@ -165,7 +165,7 @@ jobs:
- id: "distcheck-debian-stable-amd64-clang"
steps:
- name: Download built source tree archive
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ola-${{ matrix.id }}-source-tree
path: .
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
shell: bash
run: find . -type f -exec sha256sum {} \;
working-directory: built
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: ola-built-debian-${{ matrix.image_tag }}-${{ matrix.architecture }}
Expand All @@ -72,7 +72,7 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Download build artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ola-built-debian-${{ matrix.image_tag }}-${{ matrix.architecture }}
path: built
Expand All @@ -85,7 +85,7 @@ jobs:
run: apt-get -y install autopkgtest
- name: Test
run: autopkgtest --output-dir=test-output built/*ges -- null
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always() # Always upload the test output, even on failed tests
with:
name: ola-test-output-debian-${{ matrix.image_tag }}-${{ matrix.architecture }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
tar --exclude=ola-debian-stable-built-source-tree.tar.gz -cvzf ola-debian-stable-built-source-tree.tar.gz .
- name: SHA256 artifact archive
run: sha256sum ola-debian-stable-built-source-tree.tar.gz
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ola-debian-stable-built-source-tree
path: ola-debian-stable-built-source-tree.tar.gz
Expand All @@ -67,7 +67,7 @@ jobs:
needs: build
steps:
- name: Download built source tree archive
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ola-debian-stable-built-source-tree
path: .
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
needs: build
steps:
- name: Download built source tree archive
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ola-debian-stable-built-source-tree
path: .
Expand All @@ -123,7 +123,7 @@ jobs:
needs: build
steps:
- name: Download built source tree archive
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ola-debian-stable-built-source-tree
path: .
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
needs: build
steps:
- name: Download built source tree archive
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ola-debian-stable-built-source-tree
path: .
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
needs: build
steps:
- name: Download built source tree archive
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ola-debian-stable-built-source-tree
path: .
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
needs: build
steps:
- name: Download built source tree archive
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ola-debian-stable-built-source-tree
path: .
Expand Down

0 comments on commit df02c7b

Please sign in to comment.