diff --git a/.github/workflows/finalize-tests.yml b/.github/workflows/finalize-tests.yml index 8d8565add51c1..3ef41aa696123 100644 --- a/.github/workflows/finalize-tests.yml +++ b/.github/workflows/finalize-tests.yml @@ -93,7 +93,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.actor }} VERBOSE: "true" - if: inputs.upgrade-to-newer-dependencies != 'false' && inputs.platform == 'linux/amd64' + if: inputs.platform == 'linux/amd64' steps: - name: "Cleanup repo" shell: bash @@ -190,6 +190,3 @@ jobs: include-success-outputs: ${{ inputs.include-success-outputs }} docker-cache: ${{ inputs.docker-cache }} disable-airflow-repo-cache: ${{ inputs.disable-airflow-repo-cache }} - if: > - inputs.canary-run == 'true' && - (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') diff --git a/.github/workflows/push-image-cache.yml b/.github/workflows/push-image-cache.yml index b523577b46c99..c3854b2610428 100644 --- a/.github/workflows/push-image-cache.yml +++ b/.github/workflows/push-image-cache.yml @@ -229,4 +229,3 @@ jobs: --install-distributions-from-context --platform "${PLATFORM}" --airflow-constraints-mode constraints-source-providers - --push diff --git a/Dockerfile b/Dockerfile index e8aea12f0d009..3d40683c1e7af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,8 +54,8 @@ ARG PYTHON_BASE_IMAGE="python:3.10-slim-bookworm" # You can swap comments between those two args to test pip from the main version # When you attempt to test if the version of `pip` from specified branch works for our builds # Also use `force pip` label on your PR to swap all places we use `uv` to `pip` -ARG AIRFLOW_PIP_VERSION=25.1.1 -# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main" +#ARG AIRFLOW_PIP_VERSION=25.1.1 +ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main" ARG AIRFLOW_SETUPTOOLS_VERSION=80.9.0 ARG AIRFLOW_UV_VERSION=0.7.20 ARG AIRFLOW_USE_UV="false"