Skip to content

Conversation

@kaxil
Copy link
Member

@kaxil kaxil commented Mar 10, 2021

Sync v1-10-stable and v1-10-test.

This PR should not be merged, just needs approval for fast-forwarding v1-10-stable


^ 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.

kaxil and others added 6 commits March 10, 2021 22:08
If you have more than a single private key in your GPG trust store, gpg
will use the first one, which for me is not right.

This changes the script to by default use any key with `apache.org` in
the name. This is a patch I've been carrying locally for about 8
releases now :D

(cherry picked from commit 3ab5828)
closes #12832

This format is popular and supported by tools like Ansible.

```
❯ sha512sum ../airflow-dev/1.10.14rc3/apache-airflow-1.10.14rc3-bin.tar.gz
953d3c04ee6fd2fa96e126750e642fc0872add96d180901440a91bd61c494a711b48836c634d93dcb181006935772556d5b4426671bf1a638f0a0698b51b119f  ../airflow-dev/1.10.14rc3/apache-airflow-1.10.14rc3-bin.tar.gz
```

vs

```
❯ gpg --print-md SHA512 ../airflow-dev/1.10.14rc3/apache-airflow-1.10.14rc3-bin.tar.gz
../airflow-dev/1.10.14rc3/apache-airflow-1.10.14rc3-bin.tar.gz:
953D3C04 EE6FD2FA 96E12675 0E642FC0 872ADD96 D1809014 40A91BD6 1C494A71 1B48836C
 634D93DC B1810069 35772556 D5B44266 71BF1A63 8F0A0698 B51B119F
```

(cherry picked from commit a00f250)
@kaxil kaxil requested review from ashb and potiuk March 10, 2021 22:32
@boring-cyborg boring-cyborg bot added area:dev-tools area:webserver Webserver related Issues labels Mar 10, 2021
@kaxil
Copy link
Member Author

kaxil commented Mar 10, 2021

@ashb I am not sure of the last commit: 995e4b9 (PR: #14025) -- You added 2.1 milestone but the PR targets v1-10-test -- should we release it in 1.10.15 or should I remove it?

@ashb
Copy link
Member

ashb commented Mar 10, 2021

@ashb I am not sure of the last commit: 995e4b9 (PR: #14025) -- You added 2.1 milestone but the PR targets v1-10-test -- should we release it in 1.10.15 or should I remove it?

Keep it

@github-actions github-actions bot added the full tests needed We need to run full set of tests for this PR to merge label Mar 10, 2021
@github-actions
Copy link

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 master at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.

@kaxil kaxil merged commit 995e4b9 into v1-10-stable Mar 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-tools area:webserver Webserver related Issues 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.

4 participants