You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2024/11/04 17:36:05 UTC
(airflow) branch main updated: Fix condition for using uv in some jobs (#43630)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 028c14ad54b Fix condition for using uv in some jobs (#43630)
028c14ad54b is described below
commit 028c14ad54b2947272b1258474e7d2d7f08c646d
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Nov 4 18:35:58 2024 +0100
Fix condition for using uv in some jobs (#43630)
* Fix condition for using uv in some jobs
The condition to check if pip is forced in the CI has a bug
(GitHub actions bool behaviour is somewhat problematic) and uv
has not been used really for some of the jobs. This is now
fixed.
---------
Co-authored-by: Wei Lee <we...@gmail.com>
---
.github/workflows/build-images.yml | 4 ++--
.github/workflows/ci.yml | 8 ++++----
.github/workflows/finalize-tests.yml | 2 +-
.github/workflows/k8s-tests.yml | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 6bb8a9d2193..6b1160d6f17 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -204,7 +204,7 @@ jobs:
pull-request-target: "true"
is-committer-build: ${{ needs.build-info.outputs.is-committer-build }}
push-image: "true"
- use-uv: ${{ needs.build-info.outputs.force-pip && 'false' || 'true' }}
+ use-uv: ${{ needs.build-info.outputs.force-pip == 'true' && 'false' || 'true' }}
image-tag: ${{ needs.build-info.outputs.image-tag }}
platform: "linux/amd64"
python-versions: ${{ needs.build-info.outputs.python-versions }}
@@ -249,7 +249,7 @@ jobs:
pull-request-target: "true"
is-committer-build: ${{ needs.build-info.outputs.is-committer-build }}
push-image: "true"
- use-uv: ${{ needs.build-info.outputs.force-pip && 'false' || 'true' }}
+ use-uv: ${{ needs.build-info.outputs.force-pip == 'true' && 'false' || 'true' }}
image-tag: ${{ needs.build-info.outputs.image-tag }}
platform: linux/amd64
python-versions: ${{ needs.build-info.outputs.python-versions }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index acf711c4a23..5a0f2ca6106 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -206,7 +206,7 @@ jobs:
platform: "linux/amd64"
python-versions: ${{ needs.build-info.outputs.python-versions }}
branch: ${{ needs.build-info.outputs.default-branch }}
- use-uv: ${{ needs.build-info.outputs.force-pip && 'false' || 'true' }}
+ use-uv: ${{ needs.build-info.outputs.force-pip == 'true' && 'false' || 'true' }}
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
constraints-branch: ${{ needs.build-info.outputs.default-constraints-branch }}
docker-cache: ${{ needs.build-info.outputs.docker-cache }}
@@ -272,7 +272,7 @@ jobs:
latest-versions-only: ${{ needs.build-info.outputs.latest-versions-only }}
include-success-outputs: ${{ needs.build-info.outputs.include-success-outputs }}
debug-resources: ${{ needs.build-info.outputs.debug-resources }}
- use-uv: ${{ needs.build-info.outputs.force-pip && 'false' || 'true' }}
+ use-uv: ${{ needs.build-info.outputs.force-pip == 'true' && 'false' || 'true' }}
generate-constraints:
@@ -559,7 +559,7 @@ jobs:
default-python-version: ${{ needs.build-info.outputs.default-python-version }}
branch: ${{ needs.build-info.outputs.default-branch }}
push-image: "true"
- use-uv: ${{ needs.build-info.outputs.force-pip && 'false' || 'true' }}
+ use-uv: ${{ needs.build-info.outputs.force-pip == 'true' && 'false' || 'true' }}
build-provider-packages: ${{ needs.build-info.outputs.default-branch == 'main' }}
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
chicken-egg-providers: ${{ needs.build-info.outputs.chicken-egg-providers }}
@@ -642,7 +642,7 @@ jobs:
kubernetes-versions-list-as-string: ${{ needs.build-info.outputs.kubernetes-versions-list-as-string }}
kubernetes-combos-list-as-string: ${{ needs.build-info.outputs.kubernetes-combos-list-as-string }}
include-success-outputs: ${{ needs.build-info.outputs.include-success-outputs }}
- use-uv: ${{ needs.build-info.outputs.force-pip && 'false' || 'true' }}
+ use-uv: ${{ needs.build-info.outputs.force-pip == 'true' && 'false' || 'true' }}
debug-resources: ${{ needs.build-info.outputs.debug-resources }}
if: >
( needs.build-info.outputs.run-kubernetes-tests == 'true' ||
diff --git a/.github/workflows/finalize-tests.yml b/.github/workflows/finalize-tests.yml
index c948984ee10..6f9bc74168b 100644
--- a/.github/workflows/finalize-tests.yml
+++ b/.github/workflows/finalize-tests.yml
@@ -149,7 +149,7 @@ jobs:
python-versions: ${{ inputs.python-versions }}
branch: ${{ inputs.branch }}
constraints-branch: ${{ inputs.constraints-branch }}
- use-uv: ${{ needs.build-info.outputs.force-pip && 'false' || 'true' }}
+ use-uv: ${{ needs.build-info.outputs.force-pip == 'true' && 'false' || 'true' }}
include-success-outputs: ${{ inputs.include-success-outputs }}
docker-cache: ${{ inputs.docker-cache }}
disable-airflow-repo-cache: ${{ inputs.disable-airflow-repo-cache }}
diff --git a/.github/workflows/k8s-tests.yml b/.github/workflows/k8s-tests.yml
index 9a764e88c4e..3b3e067038d 100644
--- a/.github/workflows/k8s-tests.yml
+++ b/.github/workflows/k8s-tests.yml
@@ -101,7 +101,7 @@ jobs:
k8s-env-${{ steps.breeze.outputs.host-python-version }}-\
${{ hashFiles('scripts/ci/kubernetes/k8s_requirements.txt','hatch_build.py') }}"
- name: "Switch breeze to use uv"
- run: breeze setup-config --use-uv
+ run: breeze setup config --use-uv
if: inputs.use-uv == 'true'
- name: Run complete K8S tests ${{ inputs.kubernetes-combos-list-as-string }}
run: breeze k8s run-complete-tests --run-in-parallel --upgrade --no-copy-local-sources