Skip to content

Commit

Permalink
Merge pull request #286 from delphix/dlpx/pr/sumedhbala-delphix/6d812…
Browse files Browse the repository at this point in the history
…1be-e104-4248-af6c-4babb370ca33

DLPX-85639 fix linux-pkg unit tests failing due to dwarf dependency on zfs
  • Loading branch information
sumedhbala-delphix authored Apr 13, 2023
2 parents 69ed691 + e319f52 commit ec1a734
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/verify-query-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ test "$(TARGET_KERNEL_FLAVORS=generic ./query-packages.sh list linux-kernel)" ==
# Check that when a package has multiple dependencies they are printed in the
# expected format.
test "$(TARGET_KERNEL_FLAVORS="generic aws" ./query-packages.sh single -o dependencies zfs)" == \
"linux-kernel-generic,linux-kernel-aws,delphix-rust"
"linux-kernel-generic,linux-kernel-aws,delphix-rust,dwarves"

# Check that the output from the appliance list contains zfs and
# delphix-platform packages. Note, we explicitly do not use grep -q here as it
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ on: [push, pull_request]

jobs:
check-shellcheck:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- run: sudo ./.github/scripts/install-shellcheck.sh
- run: make shellcheck
check-shfmt:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- run: sudo ./.github/scripts/install-shfmt.sh
- run: make shfmtcheck
verify-query-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- run: ./.github/scripts/verify-query-packages.sh
Expand Down

0 comments on commit ec1a734

Please sign in to comment.