Skip to content
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.

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

Remove additional generation of dependencies when building CI images #36283

Merged
merged 1 commit into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 3 deletions .github/actions/build-ci-images/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ runs:
steps:
- name: "Install Breeze"
uses: ./.github/actions/breeze
- name: "Regenerate dependencies"
# This is done in case some someone updated provider dependencies and did not generate
# dependencies - in which case build image might fail because of lack of new dependencies
- name: "Check if dependencies are properly regenerated"
shell: bash
run: |
pip install rich>=12.4.4 pyyaml
Expand Down
2 changes: 1 addition & 1 deletion generated/provider_dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@
"asgiref>=3.5.2",
"gcloud-aio-auth>=4.0.0,<5.0.0",
"gcloud-aio-bigquery>=6.1.2",
"gcloud-aio-storage",
"gcloud-aio-storage>=9.0.0",
"gcsfs>=2023.10.0",
"google-ads>=22.1.0",
"google-api-core>=2.11.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,12 @@ def check_if_different_provider_used(file_path: Path) -> None:
DEPENDENCIES_JSON_FILE_PATH.write_text(json.dumps(unique_sorted_dependencies, indent=2) + "\n")
if os.environ.get("CI"):
console.print()
console.print(f"[info]Written {DEPENDENCIES_JSON_FILE_PATH}")
console.print(f"[info]There is a need to regenerate {DEPENDENCIES_JSON_FILE_PATH}")
console.print(
f"[yellow]You will need to run breeze locally and commit "
f"{DEPENDENCIES_JSON_FILE_PATH.relative_to(AIRFLOW_SOURCES_ROOT)}!\n"
f"[red]You need to run the following command locally and commit generated "
f"{DEPENDENCIES_JSON_FILE_PATH.relative_to(AIRFLOW_SOURCES_ROOT)} file:\n"
)
console.print("breeze static-checks --type update-providers-dependencies --all-files")
console.print()
else:
console.print()
Expand All @@ -227,6 +228,7 @@ def check_if_different_provider_used(file_path: Path) -> None:
)
console.print(f"[info]Written {DEPENDENCIES_JSON_FILE_PATH}")
console.print()
sys.exit(1)
else:
console.print(
"[green]No need to regenerate dependencies!\n[/]"
Expand Down