Skip to content

Commit

Permalink
Merge branch 'master' into dan/beam-22701
Browse files Browse the repository at this point in the history
  • Loading branch information
Abacn authored Jul 21, 2023
2 parents 61225e0 + cf20649 commit 8eddf8d
Show file tree
Hide file tree
Showing 194 changed files with 6,653 additions and 6,798 deletions.
60 changes: 60 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,66 @@ github:
merge: true
rebase: false

protected_branches:
master: {}
release-2.49.0: {}
release-2.48.0: {}
release-2.47.0: {}
release-2.46.0: {}
release-2.45.0: {}
release-2.44.0: {}
release-2.43.0: {}
release-2.42.0: {}
release-2.41.0: {}
release-2.40.0: {}
release-2.39.0: {}
release-2.38.0: {}
release-2.37.0: {}
release-2.36.0: {}
release-2.35.0: {}
release-2.34.0: {}
release-2.33.0: {}
release-2.32.0: {}
release-2.31.0: {}
release-2.30.0: {}
release-2.29.0: {}
release-2.28.0: {}
release-2.27.0: {}
release-2.26.0: {}
release-2.25.0: {}
release-2.24.0: {}
release-2.23.0: {}
release-2.22.0: {}
release-2.21.0: {}
release-2.20.0: {}
release-2.19.0: {}
release-2.18.0: {}
release-2.17.0: {}
release-2.16.0: {}
release-2.15.0: {}
release-2.14.0: {}
release-2.13.0: {}
release-2.12.0: {}
release-2.11.0: {}
release-2.10.0: {}
release-2.8.0: {}
release-2.8.0: {}
release-2.7.0: {}
release-2.6.0: {}
release-2.5.0: {}
release-2.4.0: {}
release-2.3.0: {}
release-2.2.0: {}
release-2.1.1: {}
release-2.1.0: {}
release-0.6.0: {}
release-0.5.0: {}
release-0.4.0: {}
release-0.4.0-incubating: {}
release-0.3.0-incubating: {}
release-0.2.0-incubating: {}
release-0.1.0-incubating: {}

notifications:
commits: commits@beam.apache.org
issues: github@beam.apache.org
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Please note that jobs with matrix need to have matrix element in the comment. Ex
|:-------------:|:------:|:--------------:|:-----------:|
| [ Go PreCommit ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Go.yml) | N/A |`Run Go PreCommit`| [![Go PreCommit](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Go.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Go.yml) |
| [ Python PreCommit Docker ](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_DockerBuild.yml) | ['3.8','3.9','3.10','3.11'] | `Run PythonDocker PreCommit (matrix_element)`| [![.github/workflows/job_PreCommit_Python_DockerBuild.yml](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_DockerBuild.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_DockerBuild.yml) |
| [ Python PreCommit Docs ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_PythonDocs.yml) | N/A | `Run PythonDocs PreCommit`| [![.github/workflows/beam_PreCommit_PythonDocs.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_PythonDocs.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_PythonDocs.yml) |
| [ Python PreCommit Formatter ](https://github.com/apache/beam/actions/workflows/job_PreCommit_PythonAutoformatter.yml) | N/A | `Run PythonFormatter PreCommit`| [![.github/workflows/job_PreCommit_PythonAutoformatter.yml](https://github.com/apache/beam/actions/workflows/job_PreCommit_PythonAutoformatter.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/job_PreCommit_PythonAutoformatter.yml) |
| [ Python PreCommit Coverage ](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Coverage.yml) | N/A | `Run Python_Coverage PreCommit`| [![.github/workflows/job_PreCommit_Python_Coverage.yml](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Coverage.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Coverage.yml) |
| [ Python PreCommit Dataframes ](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Dataframes.yml) | ['3.8','3.9','3.10','3.11'] | `Run Python_Dataframes PreCommit (matrix_element)`| [![.github/workflows/job_PreCommit_Python_Dataframes.yml](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Dataframes.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Dataframes.yml) |
Expand All @@ -28,4 +29,5 @@ Please note that jobs with matrix need to have matrix element in the comment. Ex
| [ Python PreCommit Lint ](https://github.com/apache/beam/actions/workflows/job_PreCommit_PythonLint.yml) | N/A | `Run PythonLint PreCommit` | [![.github/workflows/job_PreCommit_PythonLint.yml](https://github.com/apache/beam/actions/workflows/job_PreCommit_PythonLint.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/job_PreCommit_PythonLint.yml) |
| [ Python PreCommit Transforms ](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Transforms.yml) | ['3.8','3.9','3.10','3.11'] | `Run Python_Transforms PreCommit (matrix_element)`| [![.github/workflows/job_PreCommit_Python_Transforms.yml](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Transforms.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python_Transforms.yml) |
| [ Python PreCommit ](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python.yml) | ['3.8','3.9','3.10','3.11'] | `Run Python PreCommit (matrix_element)` | [![.github/workflows/job_PreCommit_Python.yml](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/job_PreCommit_Python.yml) |
| [ PreCommit Python Integration](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Python_Integration.yml) | ['3.8','3.11'] | `Run Python_Integration PreCommit (matrix_element)` | [![.github/workflows/beam_PreCommit_Python_Integration.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Python_Integration.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Python_Integration.yml) |
| [ RAT PreCommit ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_RAT.yml) | N/A | `Run RAT PreCommit` | [![.github/workflows/beam_PreCommit_RAT.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_RAT.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_RAT.yml) |
92 changes: 92 additions & 0 deletions .github/workflows/beam_PreCommit_CommunityMetrics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# 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.

name: PreCommit Community Metrics

on:
push:
tags: ['v*']
branches: ['master', 'release-*']
paths: ['.test-infra/metrics/**', '.github/workflows/beam_PreCommit_CommunityMetrics.yml']
pull_request_target:
branches: ['master', 'release-*']
paths: ['.test-infra/metrics/**']
issue_comment:
types: [created]
schedule:
- cron: '* */6 * * *'

#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
permissions:
actions: write
pull-requests: read
checks: read
contents: read
deployments: read
id-token: none
issues: read
discussions: read
packages: read
pages: read
repository-projects: read
security-events: read
statuses: read

jobs:
beam_PreCommit_CommunityMetrics:
name: beam_PreCommit_CommunityMetrics
runs-on: [self-hosted, ubuntu-20.04, main]
if: |
github.event_name == 'push' ||
github.event_name == 'pull_request_target' ||
github.event_name == 'schedule' ||
github.event.comment.body == 'Run CommunityMetrics PreCommit'
steps:
- uses: actions/checkout@v3
- name: Install Java
uses: actions/setup-java@v3.8.0
with:
distribution: 'zulu'
java-version: '8'
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
cache-read-only: false
- name: Rerun on comment
if: github.event.comment.body == 'Run CommunityMetrics PreCommit'
uses: ./.github/actions/rerun-job-action
with:
pull_request_url: ${{ github.event.issue.pull_request.url }}
github_repository: ${{ github.repository }}
github_token: ${{ secrets.GITHUB_TOKEN }}
github_job: ${{ github.job }}
github_current_run_id: ${{ github.run_id }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Remove default github maven configuration
run: rm ~/.m2/settings.xml
- name: Install docker compose
run: |
sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Authenticate on GCP
uses: google-github-actions/setup-gcloud@v0
with:
service_account_email: ${{ secrets.GCP_SA_EMAIL }}
service_account_key: ${{ secrets.GCP_SA_KEY }}
project_id: ${{ secrets.GCP_PROJECT_ID }}
- name: Install gcloud Kubectl
run: gcloud components install kubectl
- name: run Community Metrics PreCommit script
run: ./gradlew :communityMetricsPreCommit -PKUBE_CONFIG_PATH='$HOME/.kube/config'
4 changes: 4 additions & 0 deletions .github/workflows/beam_PreCommit_Go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ permissions:
security-events: read
statuses: read

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

jobs:
beam_PreCommit_Go:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/beam_PreCommit_Java_Examples_Dataflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ on:
schedule:
- cron: '* */6 * * *'

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
permissions:
actions: write
Expand Down
83 changes: 83 additions & 0 deletions .github/workflows/beam_PreCommit_PythonDocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# 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.

name: Python PreCommit Docs

on:
pull_request_target:
branches: [ "master", "release-*" ]
paths: ["sdks/python/**"]
issue_comment:
types: [created]
push:
tags: ['v*']
branches: ['master', 'release-*']
paths: ["sdks/python/**",".github/workflows/beam_PreCommit_PythonDocs.yml"]
schedule:
- cron: '* */6 * * *'
#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
permissions:
actions: write
pull-requests: read
checks: read
contents: read
deployments: read
id-token: none
issues: read
discussions: read
packages: read
pages: read
repository-projects: read
security-events: read
statuses: read

jobs:
beam_PreCommit_PythonDocs:
name: beam_PreCommit_PythonDocs
if: |
github.event_name == 'push' ||
github.event_name == 'pull_request_target' ||
github.event.comment.body == 'Run PythonDocs PreCommit' ||
github.event_name == 'schedule'
runs-on: [self-hosted, ubuntu-20.04, main]
steps:
- name: Check out repository code
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Rerun on comment
if: github.event.comment.body == 'Run PythonDocs PreCommit'
uses: ./.github/actions/rerun-job-action
with:
pull_request_url: ${{ github.event.issue.pull_request.url }}
github_repository: ${{ github.repository }}
github_token: ${{ secrets.GITHUB_TOKEN }}
github_job: ${{ github.job }}
github_current_run_id: ${{ github.run_id }}
- name: Install Java
uses: actions/setup-java@v3.8.0
with:
distribution: 'zulu'
java-version: '8'
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.8'
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
cache-read-only: false
- name: run PythonDocsPrecommit script
run: ./gradlew :pythonDocsPreCommit
108 changes: 108 additions & 0 deletions .github/workflows/beam_PreCommit_Python_Integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
# 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.

name: PreCommit Python Integration

on:
pull_request_target:
branches: [ "master", "release-*" ]
paths: ["model/**", "sdks/python/**", "release/**"]
issue_comment:
types: [created]
push:
tags: ['v*']
branches: ['master', 'release-*']
paths: ["model/**", "sdks/python/**", "release/**", ".github/workflows/beam_PreCommit_Python_Integration.yml"]
schedule:
- cron: '* */6 * * *'

#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
permissions:
actions: write
pull-requests: read
checks: read
contents: read
deployments: read
id-token: none
issues: read
discussions: read
packages: read
pages: read
repository-projects: read
security-events: read
statuses: read

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

jobs:
beam_PreCommit_Python_Integration:
name: beam_PreCommit_Python_Integration
strategy:
fail-fast: false
matrix:
python_version: ['3.8', '3.11']
if: |
github.event_name == 'push' ||
github.event_name == 'pull_request_target' ||
startsWith(github.event.comment.body, 'Run Python_Integration PreCommit') ||
github.event_name == 'schedule'
runs-on: [self-hosted, ubuntu-20.04, main]
steps:
- name: Check out repository code
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Set comment body with matrix
id: set_comment_body
run: |
echo "comment_body=Run Python_Integration PreCommit (${{ matrix.python_version }})" >> $GITHUB_OUTPUT
- name: Rerun on comment
if: github.event.comment.body == steps.set_comment_body.outputs.comment_body
uses: ./.github/actions/rerun-job-action
with:
pull_request_url: ${{ github.event.issue.pull_request.url }}
github_repository: ${{ github.repository }}
github_token: ${{ secrets.GITHUB_TOKEN }}
github_job: "${{ github.job }} (${{ matrix.python_version }})"
github_current_run_id: ${{ github.run_id }}
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version }}
- name: Install Java
uses: actions/setup-java@v3.8.0
with:
distribution: 'zulu'
java-version: '8'
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
cache-read-only: false
- name: run Python Integration PreCommit batch script
run: |
PY_VER=${{ matrix.python_version }}
./gradlew :sdks:python:test-suites:dataflow:py${PY_VER//.}:preCommitIT_batch -PuseWheelDistribution -PpythonVersion=${PY_VER}
- name: run Python Integration PreCommit streaming script
run: |
PY_VER=${{ matrix.python_version }}
./gradlew :sdks:python:test-suites:dataflow:py${PY_VER//.}:preCommitIT_streaming -PuseWheelDistribution -PpythonVersion=${PY_VER}
- name: Archive code coverage results
uses: actions/upload-artifact@v3
with:
name: python-code-coverage-report
path: "**/pytest*.xml"
Loading

0 comments on commit 8eddf8d

Please sign in to comment.