Просмотр исходного кода

Revert "feat(makefile): add capability to skip Docker image pull (#1463)" (#1489)

This reverts commit 442ab7371c66cd97158ea9b08de5aa37ce1d31f3.
Robert Brennan 1 год назад
Родитель
Сommit
c50319138e
2 измененных файлов с 0 добавлено и 13 удалено
  1. 0 9
      .github/workflows/run-unit-tests.yml
  2. 0 4
      Makefile

+ 0 - 9
.github/workflows/run-unit-tests.yml

@@ -10,8 +10,6 @@ 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"]
@@ -32,7 +30,6 @@ jobs:
         run: poetry install
 
       - name: Install & Start Docker
-        if: env.INSTALL_DOCKER == '1'
         run: |
           brew install colima docker
           colima start
@@ -43,8 +40,6 @@ 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
@@ -56,8 +51,6 @@ 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"]
@@ -79,8 +72,6 @@ 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

+ 0 - 4
Makefile

@@ -22,9 +22,7 @@ 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
@@ -37,9 +35,7 @@ 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)"