Skip to content

Conversation

@ashb
Copy link
Member

@ashb ashb commented Sep 7, 2021

The change to use pull_request_target had the unintended side-effect of
meaning that the images were built using the tip of the PR, instead of
the merge of main and the PR branch.

This restores that behaviour (and should mean that fewer PRs will need
rebasing to fix their builds when master gets broken)

Closes #18055


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

The change to use pull_request_target had the unintended side-effect of
meaning that the images were built using the tip of the PR, instead of
the merge of main and the PR branch.

This restores that behaviour (and should mean that fewer PRs will need
rebasing to fix their builds when master gets broken)
@github-actions github-actions bot added the full tests needed We need to run full set of tests for this PR to merge label Sep 7, 2021
@github-actions
Copy link

github-actions bot commented Sep 7, 2021

The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest main at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.

@ashb ashb merged commit 1bfb572 into apache:main Sep 7, 2021
@ashb ashb deleted the build-merge-commits-for-prs branch September 7, 2021 15:21
potiuk added a commit to potiuk/airflow that referenced this pull request Sep 7, 2021
potiuk added a commit that referenced this pull request Sep 7, 2021
…the PR (#18060)" (#18063)

This reverts commit 1bfb572. (temporarily until we add gh to our AMI)
ashb added a commit that referenced this pull request Sep 8, 2021
ashb added a commit that referenced this pull request Sep 8, 2021
… the PR (#18060)" (#18086)

This reverts commit 0dba2e0.

Revert "Revert "Build CI images for the merge result of a PR, not the tip of the PR (#18060)" (#18063)" (#18086)
potiuk pushed a commit that referenced this pull request Sep 9, 2021
… the PR (#18060)" (#18086)

This reverts commit 0dba2e0.

Revert "Revert "Build CI images for the merge result of a PR, not the tip of the PR (#18060)" (#18063)" (#18086)

(cherry picked from commit 9496235)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-tools full tests needed We need to run full set of tests for this PR to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

The current CI requires rebasing to main far too often

2 participants