From 46f9fc585f1c1ee063c6bda2942ae96ab02f0240 Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Tue, 17 Mar 2026 12:46:34 +0100 Subject: [PATCH 1/4] Add macOS testing workflow with Docker and Colima setup --- .github/workflows/test.yml | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index deb5465..6ceaca9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,13 +7,13 @@ on: branches: [master] jobs: - scripts: - name: test scripts + linux-scripts: + name: test Linux scripts runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Test Environment run: | sudo /bin/bash ./test/environment_setup.sh @@ -31,6 +31,37 @@ jobs: run: | sudo /bin/bash ./scripts/dappnode_uninstall.sh y + macos-scripts: + name: test macOS scripts + runs-on: macos-15-intel + + steps: + - name: Checkout + uses: actions/checkout@v6 + - name: Install Docker client and Colima + run: | + brew install docker colima + - name: Start Colima + run: | + colima start --cpu 2 --memory 4 --disk 20 + docker version + docker info + - name: Install DAppNode + run: | + /bin/bash ./scripts/dappnode_install.sh --local-profile-path "$PWD/.dappnode_profile" + - name: Show installation logs + if: always() + run: | + cat "$HOME/dappnode/logs/dappnode_install.log" + - name: Uninstall DAppNode + if: always() + run: | + /bin/bash ./scripts/dappnode_uninstall.sh y + - name: Stop Colima + if: always() + run: | + colima stop + iso: name: test Debian and Ubuntu ISO runs-on: ubuntu-latest From e39dae4a27fe0ab0db89ea45dc12925f08688c10 Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Tue, 17 Mar 2026 12:56:36 +0100 Subject: [PATCH 2/4] Enhance macOS testing setup by installing docker-compose and configuring CLI plugins --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ceaca9..b235fed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,10 @@ jobs: uses: actions/checkout@v6 - name: Install Docker client and Colima run: | - brew install docker colima + brew install docker docker-compose colima + mkdir -p "$HOME/.docker/cli-plugins" + ln -sf "$(command -v docker-compose)" "$HOME/.docker/cli-plugins/docker-compose" + docker compose version - name: Start Colima run: | colima start --cpu 2 --memory 4 --disk 20 From c92a86cec1917c18f12b280eee76bb90b2717c94 Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Tue, 17 Mar 2026 13:11:48 +0100 Subject: [PATCH 3/4] Add xz installation and check in macOS test setup --- .github/workflows/test.yml | 3 ++- scripts/dappnode_install.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b235fed..6df4852 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,10 +40,11 @@ jobs: uses: actions/checkout@v6 - name: Install Docker client and Colima run: | - brew install docker docker-compose colima + brew install docker docker-compose colima xz mkdir -p "$HOME/.docker/cli-plugins" ln -sf "$(command -v docker-compose)" "$HOME/.docker/cli-plugins/docker-compose" docker compose version + xz --version - name: Start Colima run: | colima start --cpu 2 --memory 4 --disk 20 diff --git a/scripts/dappnode_install.sh b/scripts/dappnode_install.sh index 0379827..f134256 100755 --- a/scripts/dappnode_install.sh +++ b/scripts/dappnode_install.sh @@ -188,6 +188,7 @@ check_prereqs() { fi require_downloader + require_cmd xz # Ensure compose is available (Docker Desktop / modern docker engine) if ! docker compose version >/dev/null 2>&1; then From 184d5195e1dcb7e3bf3b88fbccf19e7a76626fea Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Tue, 17 Mar 2026 16:12:02 +0100 Subject: [PATCH 4/4] Install xz in macOS test setup and remove xz requirement from installer script --- .github/workflows/test.yml | 19 +++++++++++++++++-- scripts/dappnode_install.sh | 1 - 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6df4852..e7d379b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,14 +40,29 @@ jobs: uses: actions/checkout@v6 - name: Install Docker client and Colima run: | - brew install docker docker-compose colima xz + brew install docker docker-compose colima mkdir -p "$HOME/.docker/cli-plugins" ln -sf "$(command -v docker-compose)" "$HOME/.docker/cli-plugins/docker-compose" docker compose version - xz --version - name: Start Colima run: | colima start --cpu 2 --memory 4 --disk 20 + colima ssh -- sh -lc ' + if command -v apk >/dev/null 2>&1; then + sudo apk add --no-cache xz + elif command -v apt-get >/dev/null 2>&1; then + sudo apt-get update && sudo apt-get install -y xz-utils + elif command -v dnf >/dev/null 2>&1; then + sudo dnf install -y xz + elif command -v yum >/dev/null 2>&1; then + sudo yum install -y xz + else + echo "Unsupported Colima guest OS; could not install xz" >&2 + exit 1 + fi + command -v xz + xz --version + ' docker version docker info - name: Install DAppNode diff --git a/scripts/dappnode_install.sh b/scripts/dappnode_install.sh index f134256..0379827 100755 --- a/scripts/dappnode_install.sh +++ b/scripts/dappnode_install.sh @@ -188,7 +188,6 @@ check_prereqs() { fi require_downloader - require_cmd xz # Ensure compose is available (Docker Desktop / modern docker engine) if ! docker compose version >/dev/null 2>&1; then