From 442ab7371c66cd97158ea9b08de5aa37ce1d31f3 Mon Sep 17 00:00:00 2001 From: "Arno.Edwards" <138990495+Umpire2018@users.noreply.github.com> Date: Wed, 1 May 2024 21:01:11 +0800 Subject: [PATCH] feat(makefile): add capability to skip Docker image pull (#1463) * feat(makefile): add capability to skip Docker image pull * ci(github-actions): add conditional Docker installation based on ENV variable --- .github/workflows/run-unit-tests.yml | 9 +++++++++ Makefile | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 47697da73d..d1d65ced64 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -10,6 +10,8 @@ jobs: test-on-macos: name: Test on macOS runs-on: macos-13 + env: + INSTALL_DOCKER: '0' # Set to '0' to skip Docker installation strategy: matrix: python-version: ["3.11"] @@ -30,6 +32,7 @@ jobs: run: poetry install - name: Install & Start Docker + if: env.INSTALL_DOCKER == '1' run: | brew install colima docker colima start @@ -40,6 +43,8 @@ jobs: - name: Build Environment run: make build + env: + SKIP_DOCKER_PULL: 1 - name: Run Tests run: poetry run pytest --cov=agenthub --cov=opendevin --cov-report=xml ./tests/unit @@ -51,6 +56,8 @@ jobs: test-on-linux: name: Test on Linux runs-on: ubuntu-latest + env: + SKIP_DOCKER_PULL: 1 # Set to 0 to pull Docker images strategy: matrix: python-version: ["3.11"] @@ -72,6 +79,8 @@ jobs: - name: Build Environment run: make build + env: + SKIP_DOCKER_PULL: 1 - name: Run Tests run: poetry run pytest --cov=agenthub --cov=opendevin --cov-report=xml ./tests/unit diff --git a/Makefile b/Makefile index 09e212030f..cc5d8db3b8 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,9 @@ RESET=$(shell tput -Txterm sgr0) build: @echo "$(GREEN)Building project...$(RESET)" @$(MAKE) -s check-dependencies +ifeq ($(SKIP_DOCKER_PULL),) @$(MAKE) -s pull-docker-image +endif @$(MAKE) -s install-python-dependencies @$(MAKE) -s install-frontend-dependencies @$(MAKE) -s install-precommit-hooks @@ -35,7 +37,9 @@ check-dependencies: @$(MAKE) -s check-python @$(MAKE) -s check-npm @$(MAKE) -s check-nodejs +ifeq ($(SKIP_DOCKER_PULL),) @$(MAKE) -s check-docker +endif @$(MAKE) -s check-poetry @echo "$(GREEN)Dependencies checked successfully.$(RESET)"