You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by GitBox <gi...@apache.org> on 2022/11/21 14:16:54 UTC
[GitHub] [beam] damccorm commented on a diff in pull request #24020: [Github Actions] - Cut Release Branch Workflow
damccorm commented on code in PR #24020:
URL: https://github.com/apache/beam/pull/24020#discussion_r1028088067
##########
.github/workflows/cut_release_branch.yml:
##########
@@ -0,0 +1,123 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This workflow will update apache beam master branch with next release version
+# and cut release branch for current development version.
+
+# To learn more about GitHub Actions in Apache Beam check the CI.md
+
+name: Cut Release Branch
+on:
+ workflow_dispatch:
+ inputs:
+ RELEASE_VERSION:
+ description: Beam version of current release
+ required: true
+ NEXT_VERSION:
+ description: Next release version
+ required: true
+
+jobs:
+ update_master:
+ runs-on: [self-hosted, ubuntu-20.04]
+ env:
+ MASTER_BRANCH: master
+ NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }}
+ SCRIPT_DIR: ./release/src/main/scripts
+ steps:
+ - name: Validate Next Version
+ run: |
+ if [[ $NEXT_RELEASE =~ ([0-9]\.[0-9]*\.[0-9]) ]]; then
+ NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}
+ fi
+ if [[ -z "$NEXT_VERSION_IN_BASE_BRANCH" ]]; then
Review Comment:
Any reason not to just use an `else`?
##########
.github/workflows/cut_release_branch.yml:
##########
@@ -0,0 +1,123 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This workflow will update apache beam master branch with next release version
+# and cut release branch for current development version.
+
+# To learn more about GitHub Actions in Apache Beam check the CI.md
+
+name: Cut Release Branch
+on:
+ workflow_dispatch:
+ inputs:
+ RELEASE_VERSION:
+ description: Beam version of current release
+ required: true
+ NEXT_VERSION:
+ description: Next release version
+ required: true
+
+jobs:
+ update_master:
+ runs-on: [self-hosted, ubuntu-20.04]
+ env:
+ MASTER_BRANCH: master
+ NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }}
+ SCRIPT_DIR: ./release/src/main/scripts
+ steps:
+ - name: Validate Next Version
+ run: |
+ if [[ $NEXT_RELEASE =~ ([0-9]\.[0-9]*\.[0-9]) ]]; then
+ NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}
+ fi
+ if [[ -z "$NEXT_VERSION_IN_BASE_BRANCH" ]]; then
+ echo "The input for NEXT_RELEASE does not match a valid format [0-9].[0-9].[0-9]"
+ exit 1
+ fi
+ echo "NEXT_VERSION_IN_BASE_BRANCH=${NEXT_VERSION_IN_BASE_BRANCH}" >> $GITHUB_ENV
+ - name: Echo value
+ run: |
+ echo "NEXT_VERSION_IN_BASE_BRANCH: $NEXT_VERSION_IN_BASE_BRANCH"
+ - name: Check out code
+ uses: actions/checkout@v3
+ - name: Set git config
+ run: |
+ git config user.name $GITHUB_ACTOR
+ git config user.email actions@"$RUNNER_NAME".local
+ - name: Update master branch
+ run: |
+ bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
+ echo "==============Update master branch as following================"
+ git diff
+ echo "==============================================================="
+ - name: Commit and Push to master branch files with Next Version
+ run: |
+ git add buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+ git add gradle.properties
+ git add sdks/python/apache_beam/version.py
+ git add sdks/go/pkg/beam/core/core.go
Review Comment:
Can this just be `git add *` or does `set_version.sh` change more than just that?
##########
.github/workflows/cut_release_branch.yml:
##########
@@ -0,0 +1,123 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This workflow will update apache beam master branch with next release version
+# and cut release branch for current development version.
+
+# To learn more about GitHub Actions in Apache Beam check the CI.md
+
+name: Cut Release Branch
+on:
+ workflow_dispatch:
+ inputs:
+ RELEASE_VERSION:
+ description: Beam version of current release
+ required: true
+ NEXT_VERSION:
+ description: Next release version
+ required: true
+
+jobs:
+ update_master:
+ runs-on: [self-hosted, ubuntu-20.04]
+ env:
+ MASTER_BRANCH: master
+ NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }}
+ SCRIPT_DIR: ./release/src/main/scripts
+ steps:
+ - name: Validate Next Version
+ run: |
+ if [[ $NEXT_RELEASE =~ ([0-9]\.[0-9]*\.[0-9]) ]]; then
+ NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}
+ fi
+ if [[ -z "$NEXT_VERSION_IN_BASE_BRANCH" ]]; then
Review Comment:
Then you could just echo that directly into the GITHUB_ENV as well.
##########
.github/workflows/cut_release_branch.yml:
##########
@@ -0,0 +1,123 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This workflow will update apache beam master branch with next release version
+# and cut release branch for current development version.
+
+# To learn more about GitHub Actions in Apache Beam check the CI.md
+
+name: Cut Release Branch
+on:
+ workflow_dispatch:
+ inputs:
+ RELEASE_VERSION:
+ description: Beam version of current release
+ required: true
+ NEXT_VERSION:
+ description: Next release version
+ required: true
+
+jobs:
+ update_master:
+ runs-on: [self-hosted, ubuntu-20.04]
+ env:
+ MASTER_BRANCH: master
+ NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }}
+ SCRIPT_DIR: ./release/src/main/scripts
+ steps:
+ - name: Validate Next Version
+ run: |
+ if [[ $NEXT_RELEASE =~ ([0-9]\.[0-9]*\.[0-9]) ]]; then
+ NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}
+ fi
+ if [[ -z "$NEXT_VERSION_IN_BASE_BRANCH" ]]; then
+ echo "The input for NEXT_RELEASE does not match a valid format [0-9].[0-9].[0-9]"
+ exit 1
+ fi
+ echo "NEXT_VERSION_IN_BASE_BRANCH=${NEXT_VERSION_IN_BASE_BRANCH}" >> $GITHUB_ENV
+ - name: Echo value
+ run: |
+ echo "NEXT_VERSION_IN_BASE_BRANCH: $NEXT_VERSION_IN_BASE_BRANCH"
+ - name: Check out code
+ uses: actions/checkout@v3
+ - name: Set git config
+ run: |
+ git config user.name $GITHUB_ACTOR
+ git config user.email actions@"$RUNNER_NAME".local
+ - name: Update master branch
+ run: |
+ bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
+ echo "==============Update master branch as following================"
+ git diff
+ echo "==============================================================="
+ - name: Commit and Push to master branch files with Next Version
+ run: |
+ git add buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+ git add gradle.properties
+ git add sdks/python/apache_beam/version.py
+ git add sdks/go/pkg/beam/core/core.go
+ git commit -m "Moving to ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT on master branch."
+ git push origin ${MASTER_BRANCH}
+
+ update_release_branch:
Review Comment:
Does the ordering matter here? Should `update_master` have a dependency on this step and run after it?
##########
.github/workflows/cut_release_branch.yml:
##########
@@ -0,0 +1,123 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This workflow will update apache beam master branch with next release version
+# and cut release branch for current development version.
+
+# To learn more about GitHub Actions in Apache Beam check the CI.md
+
+name: Cut Release Branch
+on:
+ workflow_dispatch:
+ inputs:
+ RELEASE_VERSION:
+ description: Beam version of current release
+ required: true
+ NEXT_VERSION:
+ description: Next release version
+ required: true
+
+jobs:
+ update_master:
+ runs-on: [self-hosted, ubuntu-20.04]
+ env:
+ MASTER_BRANCH: master
+ NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }}
+ SCRIPT_DIR: ./release/src/main/scripts
+ steps:
+ - name: Validate Next Version
+ run: |
+ if [[ $NEXT_RELEASE =~ ([0-9]\.[0-9]*\.[0-9]) ]]; then
+ NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}
+ fi
+ if [[ -z "$NEXT_VERSION_IN_BASE_BRANCH" ]]; then
+ echo "The input for NEXT_RELEASE does not match a valid format [0-9].[0-9].[0-9]"
+ exit 1
+ fi
+ echo "NEXT_VERSION_IN_BASE_BRANCH=${NEXT_VERSION_IN_BASE_BRANCH}" >> $GITHUB_ENV
+ - name: Echo value
+ run: |
+ echo "NEXT_VERSION_IN_BASE_BRANCH: $NEXT_VERSION_IN_BASE_BRANCH"
Review Comment:
Do we need this? Why not just print it in the previous step if you want that information?
##########
.github/workflows/cut_release_branch.yml:
##########
@@ -0,0 +1,123 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This workflow will update apache beam master branch with next release version
+# and cut release branch for current development version.
+
+# To learn more about GitHub Actions in Apache Beam check the CI.md
+
+name: Cut Release Branch
+on:
+ workflow_dispatch:
+ inputs:
+ RELEASE_VERSION:
+ description: Beam version of current release
+ required: true
+ NEXT_VERSION:
+ description: Next release version
+ required: true
+
+jobs:
+ update_master:
+ runs-on: [self-hosted, ubuntu-20.04]
+ env:
+ MASTER_BRANCH: master
+ NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }}
+ SCRIPT_DIR: ./release/src/main/scripts
+ steps:
+ - name: Validate Next Version
+ run: |
+ if [[ $NEXT_RELEASE =~ ([0-9]\.[0-9]*\.[0-9]) ]]; then
+ NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}
+ fi
+ if [[ -z "$NEXT_VERSION_IN_BASE_BRANCH" ]]; then
+ echo "The input for NEXT_RELEASE does not match a valid format [0-9].[0-9].[0-9]"
+ exit 1
+ fi
+ echo "NEXT_VERSION_IN_BASE_BRANCH=${NEXT_VERSION_IN_BASE_BRANCH}" >> $GITHUB_ENV
+ - name: Echo value
+ run: |
+ echo "NEXT_VERSION_IN_BASE_BRANCH: $NEXT_VERSION_IN_BASE_BRANCH"
+ - name: Check out code
+ uses: actions/checkout@v3
+ - name: Set git config
+ run: |
+ git config user.name $GITHUB_ACTOR
+ git config user.email actions@"$RUNNER_NAME".local
+ - name: Update master branch
+ run: |
+ bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
+ echo "==============Update master branch as following================"
+ git diff
+ echo "==============================================================="
+ - name: Commit and Push to master branch files with Next Version
+ run: |
+ git add buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+ git add gradle.properties
+ git add sdks/python/apache_beam/version.py
+ git add sdks/go/pkg/beam/core/core.go
+ git commit -m "Moving to ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT on master branch."
+ git push origin ${MASTER_BRANCH}
+
+ update_release_branch:
+ runs-on: [self-hosted, ubuntu-20.04]
+ env:
+ RELEASE: ${{ github.event.inputs.RELEASE_VERSION }}
+ steps:
+ - name: Validate Release Version
+ run: |
+ if [[ ${RELEASE} =~ ([0-9]\.[0-9]*\.[0-9]) ]]; then
+ RELEASE_VERSION=${BASH_REMATCH[1]}
+ fi
+ if [[ -z "$RELEASE_VERSION" ]]; then
Review Comment:
Same comments about `else`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org