From 21951f72e97cba086e6681f4fdc659adcaf7f756 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 16:04:17 -0600 Subject: [PATCH 01/14] Workflows releases (#140) * Add workflow to execute cut_release_branch * Update cut_release_branch.yml * WIP --- .github/workflows/cut_release_branch.yml | 115 +++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 .github/workflows/cut_release_branch.yml diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml new file mode 100644 index 000000000000..d9df0e0efef4 --- /dev/null +++ b/.github/workflows/cut_release_branch.yml @@ -0,0 +1,115 @@ +# 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: +# TODO: Replace to use self-hosted runners + runs-on: ubuntu-latest + env: + MASTER_BRANCH: master + NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }} + 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 + fi + - name: Echo value + run: | + echo "NEXT_VERSION_IN_BASE_BRANCH: ${NEXT_VERSION_IN_BASE_BRANCH}" + - name: Check out code + uses: actions/checkout@v3 + - name: Update master branch + run: + - sh ./set_version.sh "$NEXT_VERSION_IN_BASE_BRANCH" + echo "==============Update master branch as following================" + git diff + echo "===============================================================" + working-directory: 'release/src/main/scripts' + - 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 --dry-run origin ${MASTER_BRANCH} + + update_release_branch: +# TODO: Replace to use self-hosted runners + runs-on: ubuntu-latest + env: + RELEASE: ${{ github.event.inputs.RELEASE_VERSION }} + RELEASE_BRANCH: release-${RELEASE} + 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 + echo "The input for RELEASE does not match a valid format [0-9].[0-9].[0-9]" + exit + fi + - name: Echo value + run: | + echo "RELEASE_VERSION: ${RELEASE_VERSION}" + - name: Check out code + uses: actions/checkout@v3 + - name: Checkout to release branch + run: | + git checkout -b ${RELEASE_BRANCH} + echo "==================Current working branch=======================" + echo ${RELEASE_BRANCH} + echo "===============================================================" + - name: Update release version for dataflow runner + run: | + sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" \ + runners/google-cloud-dataflow-java/build.gradle + echo "===============Update release branch as following==============" + git diff + echo "===============================================================" + - name: Commit and Push to release branch + run: | + git add runners/google-cloud-dataflow-java/build.gradle + git commit -m "Set Dataflow container to release version." + git push --dry-run --set-upstream origin ${RELEASE_BRANCH} + + + + + From eec2a52000f929712d08d500fb23ef89f4f8ac46 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 16:07:27 -0600 Subject: [PATCH 02/14] Revert "Workflows releases (#140)" (#142) This reverts commit 21951f72e97cba086e6681f4fdc659adcaf7f756. --- .github/workflows/cut_release_branch.yml | 115 ----------------------- 1 file changed, 115 deletions(-) delete mode 100644 .github/workflows/cut_release_branch.yml diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml deleted file mode 100644 index d9df0e0efef4..000000000000 --- a/.github/workflows/cut_release_branch.yml +++ /dev/null @@ -1,115 +0,0 @@ -# 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: -# TODO: Replace to use self-hosted runners - runs-on: ubuntu-latest - env: - MASTER_BRANCH: master - NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }} - 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 - fi - - name: Echo value - run: | - echo "NEXT_VERSION_IN_BASE_BRANCH: ${NEXT_VERSION_IN_BASE_BRANCH}" - - name: Check out code - uses: actions/checkout@v3 - - name: Update master branch - run: - - sh ./set_version.sh "$NEXT_VERSION_IN_BASE_BRANCH" - echo "==============Update master branch as following================" - git diff - echo "===============================================================" - working-directory: 'release/src/main/scripts' - - 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 --dry-run origin ${MASTER_BRANCH} - - update_release_branch: -# TODO: Replace to use self-hosted runners - runs-on: ubuntu-latest - env: - RELEASE: ${{ github.event.inputs.RELEASE_VERSION }} - RELEASE_BRANCH: release-${RELEASE} - 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 - echo "The input for RELEASE does not match a valid format [0-9].[0-9].[0-9]" - exit - fi - - name: Echo value - run: | - echo "RELEASE_VERSION: ${RELEASE_VERSION}" - - name: Check out code - uses: actions/checkout@v3 - - name: Checkout to release branch - run: | - git checkout -b ${RELEASE_BRANCH} - echo "==================Current working branch=======================" - echo ${RELEASE_BRANCH} - echo "===============================================================" - - name: Update release version for dataflow runner - run: | - sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" \ - runners/google-cloud-dataflow-java/build.gradle - echo "===============Update release branch as following==============" - git diff - echo "===============================================================" - - name: Commit and Push to release branch - run: | - git add runners/google-cloud-dataflow-java/build.gradle - git commit -m "Set Dataflow container to release version." - git push --dry-run --set-upstream origin ${RELEASE_BRANCH} - - - - - From 00c239e764cdcb7377f79addccc21da5f22dfd5c Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 17:24:04 -0600 Subject: [PATCH 03/14] Add workflow to run cut_release_branch (#143) --- .github/workflows/cut_release_branch.yml | 123 +++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 .github/workflows/cut_release_branch.yml diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml new file mode 100644 index 000000000000..a59e307d049e --- /dev/null +++ b/.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: +# TODO: Replace to use self-hosted runners + runs-on: ubuntu-latest + env: + MASTER_BRANCH: master + NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }} + 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 + - 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: | + sh ./set_version.sh "$NEXT_VERSION_IN_BASE_BRANCH" + echo "==============Update master branch as following================" + git diff + echo "===============================================================" + working-directory: 'release/src/main/scripts' + - 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 --dry-run origin ${MASTER_BRANCH} + + update_release_branch: +# TODO: Replace to use self-hosted runners + runs-on: ubuntu-latest + env: + RELEASE: ${{ github.event.inputs.RELEASE_VERSION }} + RELEASE_BRANCH: release-${RELEASE} + 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 + echo "The input for RELEASE does not match a valid format [0-9].[0-9].[0-9]" + exit 1 + fi + - name: Echo value + run: | + echo "RELEASE_VERSION: ${RELEASE_VERSION}" + - 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: Checkout to release branch + run: | + git checkout -b ${RELEASE_BRANCH} + echo "==================Current working branch=======================" + echo ${RELEASE_BRANCH} + echo "===============================================================" + - name: Update release version for dataflow runner + run: | + sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" \ + runners/google-cloud-dataflow-java/build.gradle + echo "===============Update release branch as following==============" + git diff + echo "===============================================================" + - name: Commit and Push to release branch + run: | + git add runners/google-cloud-dataflow-java/build.gradle + git commit -m "Set Dataflow container to release version." + git push --dry-run --set-upstream origin ${RELEASE_BRANCH} + + + + + From 00e0f4b14465c310bbbecf7c102a633ca6df8607 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 17:42:37 -0600 Subject: [PATCH 04/14] Revert "Add workflow to run cut_release_branch (#143)" (#144) This reverts commit 00c239e764cdcb7377f79addccc21da5f22dfd5c. --- .github/workflows/cut_release_branch.yml | 123 ----------------------- 1 file changed, 123 deletions(-) delete mode 100644 .github/workflows/cut_release_branch.yml diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml deleted file mode 100644 index a59e307d049e..000000000000 --- a/.github/workflows/cut_release_branch.yml +++ /dev/null @@ -1,123 +0,0 @@ -# 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: -# TODO: Replace to use self-hosted runners - runs-on: ubuntu-latest - env: - MASTER_BRANCH: master - NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }} - 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 - - 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: | - sh ./set_version.sh "$NEXT_VERSION_IN_BASE_BRANCH" - echo "==============Update master branch as following================" - git diff - echo "===============================================================" - working-directory: 'release/src/main/scripts' - - 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 --dry-run origin ${MASTER_BRANCH} - - update_release_branch: -# TODO: Replace to use self-hosted runners - runs-on: ubuntu-latest - env: - RELEASE: ${{ github.event.inputs.RELEASE_VERSION }} - RELEASE_BRANCH: release-${RELEASE} - 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 - echo "The input for RELEASE does not match a valid format [0-9].[0-9].[0-9]" - exit 1 - fi - - name: Echo value - run: | - echo "RELEASE_VERSION: ${RELEASE_VERSION}" - - 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: Checkout to release branch - run: | - git checkout -b ${RELEASE_BRANCH} - echo "==================Current working branch=======================" - echo ${RELEASE_BRANCH} - echo "===============================================================" - - name: Update release version for dataflow runner - run: | - sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" \ - runners/google-cloud-dataflow-java/build.gradle - echo "===============Update release branch as following==============" - git diff - echo "===============================================================" - - name: Commit and Push to release branch - run: | - git add runners/google-cloud-dataflow-java/build.gradle - git commit -m "Set Dataflow container to release version." - git push --dry-run --set-upstream origin ${RELEASE_BRANCH} - - - - - From bbeb23bf8a8179dfb87f8ab809166852083e8edc Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 18:49:30 -0600 Subject: [PATCH 05/14] Workflows releases (#145) * Add workflow to run cut_release_branch * Add pull_request for testing * Add pull_request for testing --- .github/workflows/cut_release_branch.yml | 125 +++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 .github/workflows/cut_release_branch.yml diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml new file mode 100644 index 000000000000..7315cfbf276b --- /dev/null +++ b/.github/workflows/cut_release_branch.yml @@ -0,0 +1,125 @@ +# 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: +# TODO: Replace to use self-hosted runners + runs-on: ubuntu-latest + env: + MASTER_BRANCH: master + NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }} + 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: | + sh ./set_version.sh "$NEXT_VERSION_IN_BASE_BRANCH" + echo "==============Update master branch as following================" + git diff + echo "===============================================================" + working-directory: 'release/src/main/scripts' + - 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 --dry-run origin ${MASTER_BRANCH} + + update_release_branch: +# TODO: Replace to use self-hosted runners + runs-on: ubuntu-latest + env: + RELEASE: ${{ github.event.inputs.RELEASE_VERSION }} + RELEASE_BRANCH: release-${env.RELEASE} + 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 + echo "The input for RELEASE does not match a valid format [0-9].[0-9].[0-9]" + exit 1 + fi + echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV + - name: Echo value + run: | + echo "RELEASE_VERSION: ${RELEASE_VERSION}" + - 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: Checkout to release branch + run: | + git checkout -b ${RELEASE_BRANCH} + echo "==================Current working branch=======================" + echo ${RELEASE_BRANCH} + echo "===============================================================" + - name: Update release version for dataflow runner + run: | + sed -i -e "s/'beam-master-.*'/'${RELEASE}'/g" \ + runners/google-cloud-dataflow-java/build.gradle + echo "===============Update release branch as following==============" + git diff + echo "===============================================================" + - name: Commit and Push to release branch + run: | + git add runners/google-cloud-dataflow-java/build.gradle + git commit -m "Set Dataflow container to release version." + git push --dry-run --set-upstream origin ${RELEASE_BRANCH} + + + + + From af55e610732660ec86f2692176370ceb7efbac02 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 18:54:52 -0600 Subject: [PATCH 06/14] Workflows releases (#146) * Add workflow to run cut_release_branch * Add pull_request for testing * Add pull_request for testing * WIP --- .github/workflows/cut_release_branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml index 7315cfbf276b..56b16b37ffb5 100644 --- a/.github/workflows/cut_release_branch.yml +++ b/.github/workflows/cut_release_branch.yml @@ -60,7 +60,7 @@ jobs: git config user.email actions@"$RUNNER_NAME".local - name: Update master branch run: | - sh ./set_version.sh "$NEXT_VERSION_IN_BASE_BRANCH" + sh ./set_version.sh "${NEXT_VERSION_IN_BASE_BRANCH}" echo "==============Update master branch as following================" git diff echo "===============================================================" @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest env: RELEASE: ${{ github.event.inputs.RELEASE_VERSION }} - RELEASE_BRANCH: release-${env.RELEASE} + RELEASE_BRANCH: release-${{env.RELEASE}} steps: - name: Validate Release Version run: | From fbe8ad8259c6f36b591d5e908b4cdc5f03a5b8ec Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 22:07:21 -0600 Subject: [PATCH 07/14] Workflows releases (#147) * Add workflow to run cut_release_branch * Add pull_request for testing * Add pull_request for testing * WIP * WIP --- .github/workflows/cut_release_branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml index 56b16b37ffb5..98f716bf551c 100644 --- a/.github/workflows/cut_release_branch.yml +++ b/.github/workflows/cut_release_branch.yml @@ -79,7 +79,6 @@ jobs: runs-on: ubuntu-latest env: RELEASE: ${{ github.event.inputs.RELEASE_VERSION }} - RELEASE_BRANCH: release-${{env.RELEASE}} steps: - name: Validate Release Version run: | @@ -91,6 +90,7 @@ jobs: exit 1 fi echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV + echo "RELEASE_BRANCH=release-${RELEASE}" >> $GITHUB_ENV - name: Echo value run: | echo "RELEASE_VERSION: ${RELEASE_VERSION}" From a8a80f2fcb63c57ee5d50798451def856059ef7d Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 22:19:35 -0600 Subject: [PATCH 08/14] Workflows releases (#148) * Add workflow to run cut_release_branch * Add pull_request for testing * Add pull_request for testing * WIP * WIP * WIP --- .github/workflows/cut_release_branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml index 98f716bf551c..cdd2952d0139 100644 --- a/.github/workflows/cut_release_branch.yml +++ b/.github/workflows/cut_release_branch.yml @@ -60,7 +60,7 @@ jobs: git config user.email actions@"$RUNNER_NAME".local - name: Update master branch run: | - sh ./set_version.sh "${NEXT_VERSION_IN_BASE_BRANCH}" + bash ./set_version.sh "${NEXT_VERSION_IN_BASE_BRANCH}" echo "==============Update master branch as following================" git diff echo "===============================================================" From bdcf525e74e9e2709823b3cbb030aea1558fd220 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 22:25:10 -0600 Subject: [PATCH 09/14] Workflows releases (#149) * Add workflow to run cut_release_branch * Add pull_request for testing * Add pull_request for testing * WIP * WIP * WIP * WIP --- .github/workflows/cut_release_branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml index cdd2952d0139..2121eda124f9 100644 --- a/.github/workflows/cut_release_branch.yml +++ b/.github/workflows/cut_release_branch.yml @@ -38,6 +38,7 @@ jobs: env: MASTER_BRANCH: master NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }} + SCRIPT_DIR: ./release/src/main/scripts steps: - name: Validate Next Version run: | @@ -60,11 +61,10 @@ jobs: git config user.email actions@"$RUNNER_NAME".local - name: Update master branch run: | - bash ./set_version.sh "${NEXT_VERSION_IN_BASE_BRANCH}" + bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}" echo "==============Update master branch as following================" git diff echo "===============================================================" - working-directory: 'release/src/main/scripts' - name: Commit and Push to master branch files with Next Version run: | git add buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy From 5329c62c2fb3cff4bf7fb69a60e5d845ff0873c1 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 22:39:08 -0600 Subject: [PATCH 10/14] Workflows releases (#150) * Add workflow to run cut_release_branch * Add pull_request for testing * Add pull_request for testing * WIP * WIP * WIP * WIP * WIP --- .github/workflows/cut_release_branch.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml index 2121eda124f9..979dbf2cef1d 100644 --- a/.github/workflows/cut_release_branch.yml +++ b/.github/workflows/cut_release_branch.yml @@ -33,9 +33,8 @@ on: jobs: update_master: -# TODO: Replace to use self-hosted runners - runs-on: ubuntu-latest - env: + runs-on: [self-hosted, ubuntu-20.04] + env: MASTER_BRANCH: master NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }} SCRIPT_DIR: ./release/src/main/scripts @@ -75,8 +74,7 @@ jobs: git push --dry-run origin ${MASTER_BRANCH} update_release_branch: -# TODO: Replace to use self-hosted runners - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-20.04] env: RELEASE: ${{ github.event.inputs.RELEASE_VERSION }} steps: From 1a6e893f09d8dfbd16bc29432a3898e58be778a8 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Fri, 4 Nov 2022 22:40:10 -0600 Subject: [PATCH 11/14] Update cut_release_branch.yml --- .github/workflows/cut_release_branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml index 979dbf2cef1d..2214b304ed9a 100644 --- a/.github/workflows/cut_release_branch.yml +++ b/.github/workflows/cut_release_branch.yml @@ -34,7 +34,7 @@ on: jobs: update_master: runs-on: [self-hosted, ubuntu-20.04] - env: + env: MASTER_BRANCH: master NEXT_RELEASE: ${{ github.event.inputs.NEXT_VERSION }} SCRIPT_DIR: ./release/src/main/scripts From 1914fe8344c0b98b4eebdc9c80197d7df70ca591 Mon Sep 17 00:00:00 2001 From: Benjamin Gonzalez <74670721+benWize@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:39:24 -0600 Subject: [PATCH 12/14] Workflows releases (#151) * Add workflow to run cut_release_branch * Add pull_request for testing * Add pull_request for testing * WIP * WIP * WIP * WIP * WIP * Remove dry-run --- .github/workflows/cut_release_branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cut_release_branch.yml b/.github/workflows/cut_release_branch.yml index 2214b304ed9a..9ef5cd5f56f5 100644 --- a/.github/workflows/cut_release_branch.yml +++ b/.github/workflows/cut_release_branch.yml @@ -71,7 +71,7 @@ jobs: 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 --dry-run origin ${MASTER_BRANCH} + git push origin ${MASTER_BRANCH} update_release_branch: runs-on: [self-hosted, ubuntu-20.04] @@ -115,7 +115,7 @@ jobs: run: | git add runners/google-cloud-dataflow-java/build.gradle git commit -m "Set Dataflow container to release version." - git push --dry-run --set-upstream origin ${RELEASE_BRANCH} + git push --set-upstream origin ${RELEASE_BRANCH} From 7a1075e839a4a46bb02c391826b9c06ac224fe2b Mon Sep 17 00:00:00 2001 From: benWize Date: Mon, 7 Nov 2022 20:40:44 +0000 Subject: [PATCH 13/14] Moving to 2.45.0-SNAPSHOT on master branch. --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- gradle.properties | 4 ++-- sdks/go/pkg/beam/core/core.go | 2 +- sdks/python/apache_beam/version.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 6aa2e4859c59..f8cec4b212d5 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -390,7 +390,7 @@ class BeamModulePlugin implements Plugin { // Automatically use the official release version if we are performing a release // otherwise append '-SNAPSHOT' - project.version = '2.44.0' + project.version = '2.45.0' if (!isRelease(project)) { project.version += '-SNAPSHOT' } diff --git a/gradle.properties b/gradle.properties index d6dd324049b8..3f53986ce100 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,8 +29,8 @@ signing.gnupg.useLegacyGpg=true # buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy. # To build a custom Beam version make sure you change it in both places, see # https://github.com/apache/beam/issues/21302. -version=2.44.0-SNAPSHOT -sdk_version=2.44.0.dev +version=2.45.0-SNAPSHOT +sdk_version=2.45.0.dev javaVersion=1.8 diff --git a/sdks/go/pkg/beam/core/core.go b/sdks/go/pkg/beam/core/core.go index bec6071baba5..8dbab406f2c4 100644 --- a/sdks/go/pkg/beam/core/core.go +++ b/sdks/go/pkg/beam/core/core.go @@ -27,5 +27,5 @@ const ( // SdkName is the human readable name of the SDK for UserAgents. SdkName = "Apache Beam SDK for Go" // SdkVersion is the current version of the SDK. - SdkVersion = "2.44.0.dev" + SdkVersion = "2.45.0.dev" ) diff --git a/sdks/python/apache_beam/version.py b/sdks/python/apache_beam/version.py index 383050895938..4d21e456ce60 100644 --- a/sdks/python/apache_beam/version.py +++ b/sdks/python/apache_beam/version.py @@ -17,4 +17,4 @@ """Apache Beam SDK version information and utilities.""" -__version__ = '2.44.0.dev' +__version__ = '2.45.0.dev' From c4e52e57c3111ebfb190cb5422ae86ed2624376e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 14:06:53 +0000 Subject: [PATCH 14/14] Update pytest-xdist requirement in /sdks/python Updates the requirements on [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) to permit the latest version. - [Release notes](https://github.com/pytest-dev/pytest-xdist/releases) - [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v2.5.0...v3.0.2) --- updated-dependencies: - dependency-name: pytest-xdist dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- sdks/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 61858fa5d978..55bc89145a3f 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -285,7 +285,7 @@ def get_portability_package_data(): 'requests_mock>=1.7,<2.0', 'tenacity>=5.0.2,<6.0', 'pytest>=7.1.2,<8.0', - 'pytest-xdist>=2.5.0,<3', + 'pytest-xdist>=2.5.0,<4', 'pytest-timeout>=2.1.0,<3', 'scikit-learn>=0.20.0', 'sqlalchemy>=1.3,<2.0',