Skip to content

Commit 9cd2689

Browse files
Update ci.yml
1 parent 70102d2 commit 9cd2689

1 file changed

Lines changed: 12 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,13 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818

19-
- name: Install dependencies (curl, wget, bash)
19+
- name: Install dependencies and tools
2020
run: |
21+
# Host VMs (ubuntu-latest) require sudo for apt/dnf
2122
if command -v apt-get >/dev/null; then
22-
apt-get update && apt-get install -y bash curl wget
23+
sudo apt-get update && sudo apt-get install -y bash curl wget shellcheck shfmt
2324
elif command -v dnf >/dev/null; then
24-
dnf install -y bash curl wget
25-
fi
26-
27-
- name: Install tools
28-
run: |
29-
if command -v apt-get >/dev/null; then
30-
sudo apt-get update && sudo apt-get install -y shellcheck shfmt
31-
elif command -v dnf >/dev/null; then
32-
dnf install -y bash shellcheck shfmt
25+
sudo dnf install -y bash curl wget shellcheck shfmt
3326
fi
3427
3528
- name: ShellCheck
@@ -54,6 +47,10 @@ jobs:
5447
image: ${{ matrix.os }}
5548
options: --privileged
5649

50+
defaults:
51+
run:
52+
shell: bash
53+
5754
steps:
5855
- uses: actions/checkout@v4
5956

@@ -66,16 +63,16 @@ jobs:
6663
fi
6764
6865
- name: Run install --help
69-
run: bash install.sh --help
66+
run: ./install.sh --help
7067

7168
- name: Run uninstall --help
72-
run: bash uninstall.sh --help
69+
run: ./uninstall.sh --help
7370

7471
- name: Tool discovery smoke
7572
run: |
7673
source lib/common.sh
77-
source lib/debian.sh || true
78-
source lib/redhat.sh || true
74+
[[ -f lib/debian.sh ]] && source lib/debian.sh || true
75+
[[ -f lib/redhat.sh ]] && source lib/redhat.sh || true
7976
source lib/menu.sh
8077
dc_discover_tools install
8178
echo "Discovered ${#DC_TOOL_IDS[@]} tools"

0 commit comments

Comments
 (0)