@@ -218,6 +218,7 @@ The Release Candidate artifacts we vote upon should be the exact ones we vote ag
218
218
219
219
` ` ` shell script
220
220
git checkout v${VERSION_BRANCH} -test
221
+ git reset --hard origin/v${VERSION_BRANCH} -test
221
222
` ` `
222
223
223
224
- Set your version in ` setup.py` (without the RC tag)
@@ -241,12 +242,14 @@ The Release Candidate artifacts we vote upon should be the exact ones we vote ag
241
242
242
243
` ` ` shell script
243
244
git checkout v${VERSION_BRANCH} -stable
245
+ git reset --hard origin/v${VERSION_BRANCH} -stable
244
246
` ` `
245
247
246
248
- PR from the ' test' branch to the ' stable' branch, and manually merge it once approved. Here' s how to manually merge the PR:
247
249
248
250
```shell script
249
251
git merge --ff-only v${VERSION_BRANCH}-test
252
+ git push origin v${VERSION_BRANCH}-stable
250
253
```
251
254
252
255
- Tag your release
@@ -276,7 +279,6 @@ The Release Candidate artifacts we vote upon should be the exact ones we vote ag
276
279
- Tarball the repo
277
280
278
281
` ` ` shell script
279
- mkdir dist
280
282
git archive --format=tar.gz ${VERSION} \
281
283
--prefix=apache-airflow-${VERSION_WITHOUT_RC} / \
282
284
-o dist/apache-airflow-${VERSION_WITHOUT_RC} -source.tar.gz
@@ -307,7 +309,7 @@ The Release Candidate artifacts we vote upon should be the exact ones we vote ag
307
309
```shell script
308
310
git checkout origin/constraints-${VERSION_BRANCH}
309
311
git tag -s "constraints-${VERSION}" -m "Constraints for Apache Airflow ${VERSION}"
310
- git push origin "constraints-${VERSION}"
312
+ git push origin tag "constraints-${VERSION}"
311
313
```
312
314
313
315
- Push the artifacts to ASF dev dist repo
@@ -327,6 +329,8 @@ The Release Candidate artifacts we vote upon should be the exact ones we vote ag
327
329
cd ${VERSION}
328
330
svn add *
329
331
svn commit -m "Add artifacts for Airflow ${VERSION}"
332
+ cd ${AIRFLOW_REPO_ROOT}
333
+ rm -rf asf-dist
330
334
```
331
335
332
336
## Prepare new release branches and cache - optional when first minor version is released
0 commit comments