From a5c57fbd3a1c50feb75c3b954b0ef8b349b9192b Mon Sep 17 00:00:00 2001 From: Ray Myers Date: Thu, 10 Apr 2025 11:55:02 -0500 Subject: [PATCH] chore - Do not install playwright in CI build steps (#7786) --- .github/workflows/ghcr-build.yml | 8 ++++---- Makefile | 31 ++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ghcr-build.yml b/.github/workflows/ghcr-build.yml index 369c8d071d..a0b415869b 100644 --- a/.github/workflows/ghcr-build.yml +++ b/.github/workflows/ghcr-build.yml @@ -145,7 +145,7 @@ jobs: - name: Install poetry via pipx run: pipx install poetry - name: Install Python dependencies using Poetry - run: make install-python-dependencies + run: make install-python-dependencies POETRY_GROUP=main INSTALL_PLAYWRIGHT=0 - name: Create source distribution and Dockerfile run: poetry run python3 openhands/runtime/utils/runtime_build.py --base_image ${{ matrix.base_image.image }} --build_folder containers/runtime --force_rebuild - name: Lowercase Repository Owner @@ -220,7 +220,7 @@ jobs: - name: Install poetry via pipx run: pipx install poetry - name: Install Python dependencies using Poetry - run: make install-python-dependencies + run: make install-python-dependencies POETRY_GROUP=main INSTALL_PLAYWRIGHT=0 - name: Get hash in App Image run: | echo "Hash from app image: ${{ needs.ghcr_build_app.outputs.hash_from_app_image }}" @@ -286,7 +286,7 @@ jobs: - name: Install poetry via pipx run: pipx install poetry - name: Install Python dependencies using Poetry - run: make install-python-dependencies + run: make install-python-dependencies INSTALL_PLAYWRIGHT=0 - name: Lowercase Repository Owner run: | echo REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV @@ -355,7 +355,7 @@ jobs: - name: Install poetry via pipx run: pipx install poetry - name: Install Python dependencies using Poetry - run: make install-python-dependencies + run: make install-python-dependencies INSTALL_PLAYWRIGHT=0 - name: Lowercase Repository Owner run: | echo REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV diff --git a/Makefile b/Makefile index 53092c5ccc..a14c5bf7e3 100644 --- a/Makefile +++ b/Makefile @@ -133,20 +133,29 @@ install-python-dependencies: export HNSWLIB_NO_NATIVE=1; \ poetry run pip install chroma-hnswlib; \ fi - @poetry install - @if [ -f "/etc/manjaro-release" ]; then \ - echo "$(BLUE)Detected Manjaro Linux. Installing Playwright dependencies...$(RESET)"; \ - poetry run pip install playwright; \ - poetry run playwright install chromium; \ + @if [ -n "${POETRY_GROUP}" ]; then \ + echo "Installing only POETRY_GROUP=${POETRY_GROUP}"; \ + poetry install --only $${POETRY_GROUP}; \ else \ - if [ ! -f cache/playwright_chromium_is_installed.txt ]; then \ - echo "Running playwright install --with-deps chromium..."; \ - poetry run playwright install --with-deps chromium; \ - mkdir -p cache; \ - touch cache/playwright_chromium_is_installed.txt; \ + poetry install; \ + fi + @if [ "${INSTALL_PLAYWRIGHT}" != "false" ] && [ "${INSTALL_PLAYWRIGHT}" != "0" ]; then \ + if [ -f "/etc/manjaro-release" ]; then \ + echo "$(BLUE)Detected Manjaro Linux. Installing Playwright dependencies...$(RESET)"; \ + poetry run pip install playwright; \ + poetry run playwright install chromium; \ else \ - echo "Setup already done. Skipping playwright installation."; \ + if [ ! -f cache/playwright_chromium_is_installed.txt ]; then \ + echo "Running playwright install --with-deps chromium..."; \ + poetry run playwright install --with-deps chromium; \ + mkdir -p cache; \ + touch cache/playwright_chromium_is_installed.txt; \ + else \ + echo "Setup already done. Skipping playwright installation."; \ + fi \ fi \ + else \ + echo "Skipping Playwright installation (INSTALL_PLAYWRIGHT=${INSTALL_PLAYWRIGHT})."; \ fi @echo "$(GREEN)Python dependencies installed successfully.$(RESET)"