Skip to content

Bugfix/skip commit checks on automated ci upgrades#64856

Merged
jscheffl merged 4 commits intoapache:mainfrom
jscheffl:bugfix/skip-commit-checks-on-automated-ci-upgrades
Apr 7, 2026
Merged

Bugfix/skip commit checks on automated ci upgrades#64856
jscheffl merged 4 commits intoapache:mainfrom
jscheffl:bugfix/skip-commit-checks-on-automated-ci-upgrades

Conversation

@jscheffl
Copy link
Copy Markdown
Contributor

@jscheffl jscheffl commented Apr 7, 2026

Follow-up from #64836 and comment #64836 (review)


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst, in airflow-core/newsfragments. You can add this file in a follow-up commit after the PR is created so you know the PR number.

@potiuk
Copy link
Copy Markdown
Member

potiuk commented Apr 7, 2026

I think it's not best solution. What should happen is that we should attempt to commit - and only do "git add & git commit --no-verify" when it fails - because some of the changes done by prek will be committed then - for example generated code or scripts inlined in dockerfile.

@jscheffl
Copy link
Copy Markdown
Contributor Author

jscheffl commented Apr 7, 2026

I think it's not best solution. What should happen is that we should attempt to commit - and only do "git add & git commit --no-verify" when it fails - because some of the changes done by prek will be committed then - for example generated code or scripts inlined in dockerfile.

Good idea! Let me update (later...)

@jscheffl jscheffl force-pushed the bugfix/skip-commit-checks-on-automated-ci-upgrades branch from e4bd7c4 to 1cea06a Compare April 7, 2026 20:22
@jscheffl
Copy link
Copy Markdown
Contributor Author

jscheffl commented Apr 7, 2026

Note: Static check is fixed in #64868
Latest Boto test is a transient error on runner (out of disk space)
therefore merging.

@jscheffl jscheffl merged commit 93552c2 into apache:main Apr 7, 2026
134 of 136 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 7, 2026

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
v3-2-test Commit Link

You can attempt to backport this manually by running:

cherry_picker 93552c2 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

shivaam pushed a commit to shivaam/airflow that referenced this pull request Apr 8, 2026
* Skip pre-commit checks on automated CI tool upgrades

* Skip pre-commit checks on automated CI tool upgrades

* Review feedback, attempt with checks once, collect auto-fixes and commit again

* Shorten code
potiuk pushed a commit that referenced this pull request Apr 8, 2026
* Skip pre-commit checks on automated CI tool upgrades

* Skip pre-commit checks on automated CI tool upgrades

* Review feedback, attempt with checks once, collect auto-fixes and commit again

* Shorten code
(cherry picked from commit 93552c2)

Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com>
potiuk added a commit that referenced this pull request Apr 8, 2026
… (#64916)

* Skip pre-commit checks on automated CI tool upgrades

* Skip pre-commit checks on automated CI tool upgrades

* Review feedback, attempt with checks once, collect auto-fixes and commit again

* Shorten code
(cherry picked from commit 93552c2)

Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com>
@jscheffl
Copy link
Copy Markdown
Contributor Author

jscheffl commented Apr 8, 2026

Thanks for "backport-as-a-service" @potiuk !

vatsrahul1001 pushed a commit that referenced this pull request Apr 15, 2026
… (#64916)

* Skip pre-commit checks on automated CI tool upgrades

* Skip pre-commit checks on automated CI tool upgrades

* Review feedback, attempt with checks once, collect auto-fixes and commit again

* Shorten code
(cherry picked from commit 93552c2)

Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com>
vatsrahul1001 pushed a commit that referenced this pull request Apr 15, 2026
… (#64916)

* Skip pre-commit checks on automated CI tool upgrades

* Skip pre-commit checks on automated CI tool upgrades

* Review feedback, attempt with checks once, collect auto-fixes and commit again

* Shorten code
(cherry picked from commit 93552c2)

Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com>
vatsrahul1001 pushed a commit that referenced this pull request Apr 15, 2026
… (#64916)

* Skip pre-commit checks on automated CI tool upgrades

* Skip pre-commit checks on automated CI tool upgrades

* Review feedback, attempt with checks once, collect auto-fixes and commit again

* Shorten code
(cherry picked from commit 93552c2)

Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com>
vatsrahul1001 pushed a commit that referenced this pull request Apr 15, 2026
… (#64916)

* Skip pre-commit checks on automated CI tool upgrades

* Skip pre-commit checks on automated CI tool upgrades

* Review feedback, attempt with checks once, collect auto-fixes and commit again

* Shorten code
(cherry picked from commit 93552c2)

Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-tools backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants