Skip to content

Commit 8951c85

Browse files
authored
Merge branch 'apache:master' into cloudpickle-configurable
2 parents 4cf6cde + cd01e34 commit 8951c85

142 files changed

Lines changed: 15285 additions & 8205 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.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"https://github.com/apache/beam/pull/34830": "testing"
2+
"https://github.com/apache/beam/pull/34830": "testing",
3+
"https://github.com/apache/beam/issues/35429": "testing"
34
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"https://github.com/apache/beam/pull/34830": "testing"
2+
"https://github.com/apache/beam/pull/34830": "testing",
3+
"https://github.com/apache/beam/issues/35429": "testing"
34
}
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": 6
3+
"modification": 7
44
}

.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
with:
7575
java-version: |
7676
17
77-
8
77+
11
7878
- name: Prepare test arguments
7979
uses: ./.github/actions/test-arguments-action
8080
with:

.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
with:
7575
java-version: |
7676
17
77-
8
77+
11
7878
- name: Prepare test arguments
7979
uses: ./.github/actions/test-arguments-action
8080
with:

.github/workflows/beam_PostCommit_Java_DataflowV1.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ jobs:
7575
- name: Setup environment
7676
uses: ./.github/actions/setup-environment-action
7777
with:
78-
java-version: |
79-
11
80-
8
78+
java-version: default
8179
- name: run PostCommit Java Dataflow V1 script
8280
uses: ./.github/actions/gradle-command-self-hosted-action
8381
with:

.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
java-version: |
7777
17
78-
8
78+
11
7979
- name: run PostCommit Java Jpms Dataflow Java17 script
8080
uses: ./.github/actions/gradle-command-self-hosted-action
8181
with:

.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
java-version: |
7777
17
78-
8
78+
11
7979
- name: run PostCommit Java Jpms Direct Java17 script
8080
uses: ./.github/actions/gradle-command-self-hosted-action
8181
with:

.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
distribution: 'temurin'
7777
java-version: |
7878
21
79-
8
79+
11
8080
- name: run PostCommit Java Jpms Direct Java21 script
8181
uses: ./.github/actions/gradle-command-self-hosted-action
8282
with:

.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ jobs:
7777
- name: Setup environment
7878
uses: ./.github/actions/setup-environment-action
7979
with:
80-
java-version: |
81-
11
82-
8
80+
java-version: default
8381
python-version: ${{ matrix.python_version }}
8482
- name: Set PY_VER_CLEAN
8583
id: set_py_ver_clean

0 commit comments

Comments
 (0)