Skip to content

Always use shared cache, no matter if we are using uv or not #50923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
May 22, 2025
Merged

Always use shared cache, no matter if we are using uv or not #50923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,9 @@ function determine_airflow_to_use() {
echo
# Use uv run to install necessary dependencies automatically
# in the future we will be able to use uv sync when `uv.lock` is supported
uv run /opt/airflow/scripts/in_container/install_development_dependencies.py \
# for the use in parallel runs in docker containers--no-cache is needed - otherwise there is
# possibility of overriding temporary environments by multiple parallel processes
uv run --no-cache /opt/airflow/scripts/in_container/install_development_dependencies.py \
--constraint https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt
# Some packages might leave legacy typing module which causes test issues
# shellcheck disable=SC2086
Expand Down
4 changes: 2 additions & 2 deletions dev/breeze/src/airflow_breeze/params/shell_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ def compose_file(self) -> str:
self.add_docker_in_docker(compose_file_list)
compose_file_list.extend(backend_files)
compose_file_list.append(DOCKER_COMPOSE_DIR / "files.yml")
if os.environ.get("CI", "false") == "true" and self.use_uv:
compose_file_list.append(DOCKER_COMPOSE_DIR / "ci-uv-tests.yml")
if os.environ.get("CI", "false") == "true":
compose_file_list.append(DOCKER_COMPOSE_DIR / "ci-tests.yml")

if self.use_airflow_version is not None and self.mount_sources not in USE_AIRFLOW_MOUNT_SOURCES:
get_console().print(
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/docker-compose/ci-uv-tests.yml → scripts/ci/docker-compose/ci-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ services:
airflow:
volumes:
# We should be ok with sharing the cache between the builds - now that we are using uv
# The cache should be safe to share between parallel builds as UV is build to support it.
- /mnt/.cache:/root/.cache
# The cache should be safe to share between parallel builds.
- /mnt/.cache/uv:/root/.cache/uv
4 changes: 3 additions & 1 deletion scripts/docker/entrypoint_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,9 @@ function determine_airflow_to_use() {
echo
# Use uv run to install necessary dependencies automatically
# in the future we will be able to use uv sync when `uv.lock` is supported
uv run /opt/airflow/scripts/in_container/install_development_dependencies.py \
# for the use in parallel runs in docker containers--no-cache is needed - otherwise there is
# possibility of overriding temporary environments by multiple parallel processes
uv run --no-cache /opt/airflow/scripts/in_container/install_development_dependencies.py \
--constraint https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt
# Some packages might leave legacy typing module which causes test issues
# shellcheck disable=SC2086
Expand Down
Loading