diff --git a/action.yml b/action.yml index 2169d83..f23de52 100644 --- a/action.yml +++ b/action.yml @@ -88,14 +88,16 @@ runs: install colima-$(uname)-$(uname -m) /usr/local/bin/colima echo "::endgroup::" shell: bash - - name: Install QEMU, Docker client, and Docker Compose + - name: Install QEMU static binaries + uses: docker/setup-qemu-action@v3 + - name: Install Docker client, and Docker Compose env: HOMEBREW_NO_AUTO_UPDATE: "1" HOMEBREW_NO_INSTALL_UPGRADE: "1" HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" run: | - echo "::group::Installing QEMU, Docker client, and Docker Compose" - brew install docker docker-compose qemu 2>&1 | tee install.log + echo "::group::Installing Docker client, and Docker Compose" + brew install docker docker-compose echo "::endgroup::" shell: bash - name: Configure Docker Compose plugin @@ -103,22 +105,6 @@ runs: mkdir -p ~/.docker/cli-plugins ln -sfn "$(brew --prefix)/opt/docker-compose/bin/docker-compose" ~/.docker/cli-plugins/docker-compose shell: bash - - name: Check QEMU version - if: inputs.upgrade-qemu != 'true' - run: | - if grep -q "qemu 8.1.0 is already installed" install.log - then - echo "Detected broken QEMU bottle installed by brew, removing and reinstalling." - brew reinstall qemu - fi - shell: bash - - name: Upgrade QEMU - if: inputs.upgrade-qemu == 'true' - env: - HOMEBREW_NO_AUTO_UPDATE: "1" - HOMEBREW_NO_INSTALL_UPGRADE: "1" - run: brew upgrade qemu - shell: bash - name: Start Colima env: COLIMA_NETWORK_ADDRESS: ${{ inputs.colima-network-address }}