From d9ebe84a2a1360aa685c2235b67a450acdcc3059 Mon Sep 17 00:00:00 2001 From: Matthew Evans <7916000+ml-evs@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:15:36 +0100 Subject: [PATCH] Tweak git version spoofing in docker config, and test it (#1006) - Remove annoying warning by removing default value for spoof version in docker-compose - Add version spoof to CI to check that it does not introduce build failure --- .github/workflows/ci.yml | 1 + docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e44714057..3b1b31612 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,6 +140,7 @@ jobs: run: | cp webapp/.env.test_e2e .env echo "PYDATALAB_TESTING=true" >> pydatalab/.env + echo "SETUPTOOLS_SCM_PRETEND_VERSION=0.11.11rc8" >> pydatalab/.env - name: Load previously built Docker images uses: docker/bake-action@v5 diff --git a/docker-compose.yml b/docker-compose.yml index 6b3608d3d..ccd6dac43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: dockerfile: .docker/server_dockerfile args: - WEB_CONCURRENCY=4 - - SETUPTOOLS_SCM_PRETEND_VERSION=${SETUPTOOLS_SCM_PRETEND_VERSION} + - SETUPTOOLS_SCM_PRETEND_VERSION depends_on: - database restart: unless-stopped