Skip to content

Commit 184d519

Browse files
Install xz in macOS test setup and remove xz requirement from installer script
1 parent c92a86c commit 184d519

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

.github/workflows/test.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,29 @@ jobs:
4040
uses: actions/checkout@v6
4141
- name: Install Docker client and Colima
4242
run: |
43-
brew install docker docker-compose colima xz
43+
brew install docker docker-compose colima
4444
mkdir -p "$HOME/.docker/cli-plugins"
4545
ln -sf "$(command -v docker-compose)" "$HOME/.docker/cli-plugins/docker-compose"
4646
docker compose version
47-
xz --version
4847
- name: Start Colima
4948
run: |
5049
colima start --cpu 2 --memory 4 --disk 20
50+
colima ssh -- sh -lc '
51+
if command -v apk >/dev/null 2>&1; then
52+
sudo apk add --no-cache xz
53+
elif command -v apt-get >/dev/null 2>&1; then
54+
sudo apt-get update && sudo apt-get install -y xz-utils
55+
elif command -v dnf >/dev/null 2>&1; then
56+
sudo dnf install -y xz
57+
elif command -v yum >/dev/null 2>&1; then
58+
sudo yum install -y xz
59+
else
60+
echo "Unsupported Colima guest OS; could not install xz" >&2
61+
exit 1
62+
fi
63+
command -v xz
64+
xz --version
65+
'
5166
docker version
5267
docker info
5368
- name: Install DAppNode

scripts/dappnode_install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ check_prereqs() {
188188
fi
189189

190190
require_downloader
191-
require_cmd xz
192191

193192
# Ensure compose is available (Docker Desktop / modern docker engine)
194193
if ! docker compose version >/dev/null 2>&1; then

0 commit comments

Comments
 (0)