From fe449cde5935a152f846ecee5db75dada86d7a89 Mon Sep 17 00:00:00 2001 From: Kevin Meinhardt Date: Tue, 10 Dec 2024 22:37:57 +0100 Subject: [PATCH] Add deps mount: - Added support for installing CI dependencies via a new environment variable `INSTALL_CI_DEPS`. - Introduced a new script `install_deps.py` to streamline the installation of pip and npm dependencies based on specified targets. - Updated `docker-compose.yml` to include a new volume for dependencies and adjusted service configurations accordingly. - Modified `Makefile-docker` to incorporate checks for CI dependencies and streamline the update process. - Enhanced GitHub Actions workflows to support the new CI dependency installation feature. --- .github/actions/run-docker/action.yml | 5 + .github/workflows/_test_check.yml | 8 +- Dockerfile | 15 +- Makefile-docker | 36 ++- Makefile-os | 19 +- docker-compose.yml | 18 +- requirements/ci.txt | 302 ++++++++++++++++++++++++ requirements/dev.txt | 322 ++------------------------ requirements/prod.txt | 13 ++ scripts/install_deps.py | 75 ++++++ 10 files changed, 493 insertions(+), 320 deletions(-) create mode 100644 requirements/ci.txt create mode 100755 scripts/install_deps.py diff --git a/.github/actions/run-docker/action.yml b/.github/actions/run-docker/action.yml index cf7bafaa3179..48004b32e04d 100644 --- a/.github/actions/run-docker/action.yml +++ b/.github/actions/run-docker/action.yml @@ -23,6 +23,10 @@ inputs: description: 'Skip data backup' required: false default: 'true' + install_ci_deps: + description: 'Install CI dependencies' + required: false + default: 'true' runs: using: 'composite' @@ -40,6 +44,7 @@ runs: COMPOSE_FILE: ${{ inputs.compose_file }} HOST_UID: ${{ steps.id.outputs.id }} DATA_BACKUP_SKIP: ${{ inputs.data_backup_skip }} + INSTALL_CI_DEPS: ${{ inputs.install_ci_deps }} run: | # Start the specified services make up diff --git a/.github/workflows/_test_check.yml b/.github/workflows/_test_check.yml index df5749218b1c..0dd4fc3bcb31 100644 --- a/.github/workflows/_test_check.yml +++ b/.github/workflows/_test_check.yml @@ -46,6 +46,7 @@ jobs: name: | version: '${{ matrix.version }}' | compose_file: '${{ matrix.compose_file }}' + install_ci_deps: '${{ matrix.install_ci_deps }}' strategy: fail-fast: false matrix: @@ -55,6 +56,9 @@ jobs: compose_file: - docker-compose.yml - docker-compose.yml:docker-compose.ci.yml + install_ci_deps: + - false + - true steps: - uses: actions/checkout@v4 - shell: bash @@ -63,7 +67,7 @@ jobs: cat <