[ https://issues.apache.org/jira/browse/FLINK-37035?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17915931#comment-17915931 ]
Weijie Guo edited comment on FLINK-37035 at 1/22/25 6:34 AM: ------------------------------------------------------------- - Add new version 2.1 and update GHA nightly build versions in 78b31f60756031f3c62bccd44943c7ed5db60d8e. - Build doc for release-2.0 branch in 836fd99dcbd81aa0a655d83febece7f754358e9b. - update flink-benchmark point to 2.1-SNAPSHOT via 5e2164bd. - update flink-docker repo in progress. was (Author: weijie guo): Add new version 2.1 and update GHA nightly build versions in 78b31f60756031f3c62bccd44943c7ed5db60d8e. Build doc for release-2.0 branch in 836fd99dcbd81aa0a655d83febece7f754358e9b. update flink-benchmark point to 2.1-SNAPSHOT via 5e2164bd. update flink-docker repo in progress. > [Release-2.0] Create a release branch > -------------------------------------- > > Key: FLINK-37035 > URL: https://issues.apache.org/jira/browse/FLINK-37035 > Project: Flink > Issue Type: Sub-task > Components: Release System > Reporter: Xintong Song > Assignee: Xintong Song > Priority: Major > Labels: pull-request-available > Fix For: 2.0.0 > > > If you are doing a new major release, you need to update Flink version in the > following repositories and the [AzureCI project > configuration|https://dev.azure.com/apache-flink/apache-flink/]: > * [apache/flink|https://github.com/apache/flink] > * [apache/flink-docker|https://github.com/apache/flink-docker] > * [apache/flink-benchmarks|https://github.com/apache/flink-benchmarks] > Patch releases don't require the these repositories to be touched. Simply > checkout the already existing branch for that version: > {code:java} > $ git checkout release-$SHORT_RELEASE_VERSION > {code} > h4. Flink repository > Create a branch for the new version that we want to release before updating > the master branch to the next development version: > {code:bash} > $ cd ./tools > tools $ releasing/create_snapshot_branch.sh > tools $ git checkout master > tools $ OLD_VERSION=$CURRENT_SNAPSHOT_VERSION > NEW_VERSION=$NEXT_SNAPSHOT_VERSION releasing/update_branch_version.sh > {code} > In the {{master}} branch, add a new value (e.g. {{v1_16("1.16")}}) to > [apache-flink:flink-annotations/src/main/java/org/apache/flink/FlinkVersion|https://github.com/apache/flink/blob/master/flink-annotations/src/main/java/org/apache/flink/FlinkVersion.java] > as the last entry: > {code:java} > // ... > v1_12("1.12"), > v1_13("1.13"), > v1_14("1.14"), > v1_15("1.15"), > v1_16("1.16"); > {code} > Additionally in master, update the branch list of the GitHub Actions nightly > workflow (see > [apache/flink:.github/workflows/nightly-trigger.yml#L31ff|https://github.com/apache/flink/blob/master/.github/workflows/nightly-trigger.yml#L31]): > The two most-recent releases and master should be covered. > The newly created branch and updated {{master}} branch need to be pushed to > the official repository. > h4. Flink Docker Repository > Afterwards fork off from {{dev-master}} a {{dev-x.y}} branch in the > [apache/flink-docker|https://github.com/apache/flink-docker] repository. Make > sure that > [apache/flink-docker:.github/workflows/ci.yml|https://github.com/apache/flink-docker/blob/dev-master/.github/workflows/ci.yml] > points to the correct snapshot version; for {{dev-x.y}} it should point to > {{{}x.y-SNAPSHOT{}}}, while for {{dev-master}} it should point to the most > recent snapshot version (\{[$NEXT_SNAPSHOT_VERSION}}). > After pushing the new minor release branch, as the last step you should also > update the documentation workflow to also build the documentation for the new > release branch. Check [Managing > Documentation|https://cwiki.apache.org/confluence/display/FLINK/Managing+Documentation] > on details on how to do that. You may also want to manually trigger a build > to make the changes visible as soon as possible. > h4. Flink Benchmark Repository > First of all, checkout the {{master}} branch to {{dev-x.y}} branch in > [apache/flink-benchmarks|https://github.com/apache/flink-benchmarks], so that > we can have a branch named {{dev-x.y}} which could be built on top of > (${{CURRENT_SNAPSHOT_VERSION}}). > Then, inside the repository you need to manually update the {{flink.version}} > property inside the parent *pom.xml* file. It should be pointing to the most > recent snapshot version ($NEXT_SNAPSHOT_VERSION). For example: > {code:xml} > <flink.version>1.18-SNAPSHOT</flink.version> > {code} > h4. AzureCI Project Configuration > The new release branch needs to be configured within AzureCI to make azure > aware of the new release branch. This matter can only be handled by Ververica > employees since they are owning the AzureCI setup. > > ---- > h3. Expectations (Minor Version only if not stated otherwise) > * Release branch has been created and pushed > * Changes on the new release branch are picked up by [Azure > CI|https://dev.azure.com/apache-flink/apache-flink/_build?definitionId=1&_a=summary] > * {{master}} branch has the version information updated to the new version > (check pom.xml files and > * > [apache-flink:flink-annotations/src/main/java/org/apache/flink/FlinkVersion|https://github.com/apache/flink/blob/master/flink-annotations/src/main/java/org/apache/flink/FlinkVersion.java] > enum) > * > [apache/flink:.github/workflows/nightly-trigger.yml#L31ff|https://github.com/apache/flink/blob/master/.github/workflows/nightly-trigger.yml#L31] > should have the new release branch included > * New version is added to the > [apache-flink:flink-annotations/src/main/java/org/apache/flink/FlinkVersion|https://github.com/apache/flink/blob/master/flink-annotations/src/main/java/org/apache/flink/FlinkVersion.java] > enum. > * Make sure [flink-docker|https://github.com/apache/flink-docker/] has > {{dev-x.y}} branch and docker e2e tests run against this branch in the > corresponding Apache Flink release branch (see > [apache/flink:flink-end-to-end-tests/test-scripts/common_docker.sh:51|https://github.com/apache/flink/blob/master/flink-end-to-end-tests/test-scripts/common_docker.sh#L51]) > * > [apache-flink:docs/config.toml|https://github.com/apache/flink/blob/release-1.17/docs/config.toml] > has been updated appropriately in the new Apache Flink release branch. > * The {{flink.version}} property (see > [apache/flink-benchmarks:pom.xml|https://github.com/apache/flink-benchmarks/blob/master/pom.xml#L48] > of Flink Benchmark repo has been updated to the latest snapshot version. -- This message was sent by Atlassian Jira (v8.20.10#820010)