diff --git a/.github/workflows/flow-pull-request-checks-on-macos.yaml b/.github/workflows/flow-pull-request-checks-on-macos.yaml index 6a69cbd8..fc646e0a 100644 --- a/.github/workflows/flow-pull-request-checks-on-macos.yaml +++ b/.github/workflows/flow-pull-request-checks-on-macos.yaml @@ -64,40 +64,38 @@ jobs: - name: Install Lima env: GH_TOKEN: ${{ github.token }} -# INPUT_LIMA: latest + INPUT_LIMA: latest run: | -# if [ $INPUT_LIMA == "latest" ] -# then -# LIMA_VERSION=$(gh release -R lima-vm/lima view --json tagName -q ".tagName") -# else -# LIMA_VERSION=$INPUT_LIMA -# fi - - LIMA_VERSION=$(gh release -R lima-vm/lima view --json tagName -q ".tagName") -# echo "::group::Installing Lima version $LIMA_VERSION" + if [ $INPUT_LIMA == "latest" ] + then + LIMA_VERSION=$(gh release -R lima-vm/lima view --json tagName -q ".tagName") + else + LIMA_VERSION=$INPUT_LIMA + fi + + echo "::group::Installing Lima version $LIMA_VERSION" curl -fsSL "https://github.com/lima-vm/lima/releases/download/${LIMA_VERSION}/lima-${LIMA_VERSION:1}-$(uname -s)-$(uname -m).tar.gz" | tar Cxzvm /usr/local -# echo "::endgroup::" + echo "::endgroup::" shell: bash - name: Install Colima env: GH_TOKEN: ${{ github.token }} -# INPUT_COLIMA: latest + INPUT_COLIMA: latest run: | -# if [ $INPUT_COLIMA == "latest" ] -# then -# COLIMA_VERSION=$(gh release -R abiosoft/colima view --json tagName -q ".tagName") -# else -# COLIMA_VERSION=$INPUT_COLIMA -# fi - - COLIMA_VERSION=$(gh release -R abiosoft/colima view --json tagName -q ".tagName") -# echo "::group::Installing Colima version $COLIMA_VERSION" + if [ $INPUT_COLIMA == "latest" ] + then + COLIMA_VERSION=$(gh release -R abiosoft/colima view --json tagName -q ".tagName") + else + COLIMA_VERSION=$INPUT_COLIMA + fi + + echo "::group::Installing Colima version $COLIMA_VERSION" curl -LO https://github.com/abiosoft/colima/releases/download/${COLIMA_VERSION}/colima-$(uname)-$(uname -m) # install in $PATH install colima-$(uname)-$(uname -m) /usr/local/bin/colima -# echo "::endgroup::" + echo "::endgroup::" shell: bash - name: Workaround for Python conflicts in GHA Runners @@ -117,12 +115,12 @@ jobs: HOMEBREW_NO_INSTALL_UPGRADE: "1" HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" run: | -# echo "::group::Installing QEMU, Docker client, and Docker Compose" + echo "::group::Installing QEMU, Docker client, and Docker Compose" brew install docker docker-compose # Installing QEMU 9.0.2 as a temporary workaround. Version 9.1.0 seems to be broken with Lima/Colima at the moment. wget https://raw.githubusercontent.com/Homebrew/homebrew-core/f1a9cf104a9a51779c7a532b658c490f69974839/Formula/q/qemu.rb brew install qemu.rb 2>&1 | tee install.log -# echo "::endgroup::" + echo "::endgroup::" shell: bash - name: Configure Docker Compose plugin