Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 99c07a7

Browse files
damccormdamccorm
committed
Merge branch 'master' of https://github.com/apache/beam into users/damccorm/prismByDefault
2 parents 81e5e8a + 2ab8edf commit 99c07a7

133 files changed

Lines changed: 9938 additions & 7539 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/REVIEWERS.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ labels:
6666
exclusionList: []
6767
- name: website
6868
reviewers:
69-
- rszper
70-
- melap
7169
- damccorm
7270
- liferoad
7371
- kennknowles
@@ -76,9 +74,9 @@ fallbackReviewers:
7674
- Abacn
7775
- chamikaramj
7876
- damccorm
79-
- johnjcasey
8077
- jrmccluskey
8178
- kennknowles
79+
- liferoad
8280
- robertwb
8381
- shunping
8482
- tvalentyn

‎.github/trigger_files/beam_PostCommit_Python.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run.",
3-
"https://github.com/apache/beam/pull/32440": "test new datastream runner for batch"
4-
"modification": 10
3+
"modification": 12
54
}
65

‎.github/trigger_files/beam_PostCommit_Python_Dependency.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
3-
"modification": 1
3+
"modification": 0
44
}

‎.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,25 @@ jobs:
8383
uses: ./.github/actions/setup-environment-action
8484
with:
8585
java-version: 17
86+
- name: Set DOCKER_TAG unique variable based on timestamp
87+
run: echo "DOCKER_TAG=$(date +'%Y%m%d-%H%M%S%N')" >> $GITHUB_ENV
88+
- name: GCloud Docker credential helper
89+
run: |
90+
gcloud auth configure-docker us.gcr.io
8691
- name: run PostCommit Java Distroless Examples Dataflow V2 script
8792
uses: ./.github/actions/gradle-command-self-hosted-action
93+
env:
94+
USER: github-actions
8895
with:
89-
gradle-command: :runners:google-cloud-dataflow-java:examplesJavaDistrolessRunnerV2PreCommit
96+
gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTestDistroless
9097
max-workers: 12
98+
arguments: |
99+
-PdisableSpotlessCheck=true \
100+
-PdisableCheckStyle=true \
101+
-PskipCheckerFramework \
102+
-PtestJavaVersion=java17 \
103+
-Pjava17Home=$JAVA_HOME_17_X64 \
104+
-PdockerTag=${{ env.DOCKER_TAG }} \
91105
- name: Archive JUnit Test Results
92106
uses: actions/upload-artifact@v4
93107
if: ${{ !success() }}

‎.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
- name: Build and Test
113113
uses: ./.github/actions/gradle-command-self-hosted-action
114114
with:
115-
gradle-command: :runners:google-cloud-dataflow-java:examples:preCommit
115+
gradle-command: :runners:google-cloud-dataflow-java:examples:preCommit :runners:google-cloud-dataflow-java:examplesJavaDistrolessRunnerV2PreCommit
116116
arguments: |
117117
-PdisableSpotlessCheck=true \
118118
-PdisableCheckStyle=true \

‎.github/workflows/beam_PreCommit_Java_GCP_IO_Direct.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020
tags: ['v*']
2121
branches: ['master', 'release-*']
2222
paths:
23+
- "buildSrc/**"
2324
- "runners/core-java/**"
2425
- "sdks/java/core/src/main/**"
2526
- "sdks/java/extensions/arrow/**"
@@ -33,6 +34,7 @@ on:
3334
pull_request_target:
3435
branches: ['master', 'release-*']
3536
paths:
37+
- "buildSrc/**"
3638
- "runners/core-java/**"
3739
- 'release/trigger_all_tests.json'
3840
- '.github/trigger_files/beam_PreCommit_Java_GCP_IO_Direct.json'

‎.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,12 @@ jobs:
8787
github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
8888
- name: Setup environment
8989
uses: ./.github/actions/setup-environment-action
90-
with:
91-
java-version: |
92-
8
93-
11
94-
# TODO(https://github.com/apache/beam/issues/32207) Run test with Java11
9590
- name: run sparkVersionsTest script
9691
uses: ./.github/actions/gradle-command-self-hosted-action
9792
with:
9893
gradle-command: :runners:spark:3:sparkVersionsTest
9994
arguments: |
10095
-PdisableSpotlessCheck=true \
101-
-PtestJavaVersion=8 \
102-
-Pjava8Home=$JAVA_HOME_8_X64 \
10396
- name: Archive JUnit Test Results
10497
uses: actions/upload-artifact@v4
10598
if: ${{ !success() }}

‎.github/workflows/beam_Release_NightlySnapshot.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,6 @@ jobs:
7979
run: |
8080
./gradlew publish --max-workers=8 -Ppublishing -PskipCheckerFramework \
8181
--continue -Dorg.gradle.jvmargs=-Xms2g -Dorg.gradle.jvmargs=-Xmx6g \
82-
-Dorg.gradle.vfs.watch=false -Pdocker-pull-licenses
82+
-Dorg.gradle.vfs.watch=false -Pdocker-pull-licenses \
83+
-Dorg.gradle.internal.http.connectionTimeout=60000 \
84+
-Dorg.gradle.internal.http.socketTimeout=120000

‎.github/workflows/build_release_candidate.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,11 @@ jobs:
325325
uses: actions/setup-node@v4
326326
with:
327327
node-version: '16'
328-
# TODO(https://github.com/apache/beam/issues/32726) switch to Java11
329-
- name: Install Java 8
328+
- name: Install Java 11
330329
uses: actions/setup-java@v4
331330
with:
332331
distribution: 'temurin'
333-
java-version: '8'
332+
java-version: '11'
334333
- name: Remove default github maven configuration
335334
# This step is a workaround to avoid a decryption issue of Beam's
336335
# net.linguica.gradle.maven.settings plugin and github's provided maven

‎.github/workflows/stale.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ jobs:
3636
stale-pr-label: 'stale'
3737
days-before-pr-stale: 60
3838
days-before-pr-close: 7
39-
days-before-issue-close: -1
40-
days-before-issue-stale: -1
39+
stale-issue-label: 'stale'
40+
stale-issue-message: 'This issue has been marked as stale due to 150 days of inactivity. It will be closed in 30 days if no further activity occurs. If you think that’s incorrect or this issue still needs to be addressed, please simply write any comment. If closed, you can reopen the issue at any time. Thank you for your contributions.'
41+
close-issue-message: 'This issue has been closed due to lack of activity. If you think that is incorrect, you can reopen the issue at any time.'
42+
days-before-issue-stale: 150
43+
days-before-issue-close: 30
4144
exempt-pr-labels: "pinned,security"
4245
operations-per-run: 100

0 commit comments

Comments
 (0)