Skip to content

Commit f11e5b8

Browse files
authored
Merge branch 'master' into update-python-images
2 parents d341ab8 + d6d2433 commit f11e5b8

File tree

303 files changed

+5207
-2858
lines changed

Some content is hidden

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

303 files changed

+5207
-2858
lines changed

.github/actions/gradle-command-self-hosted-action/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ runs:
4242
rm ~/.m2/settings.xml
4343
fi
4444
./gradlew ${{ inputs.gradle-command }} --max-workers=${{ inputs.max-workers }} --continue --no-daemon \
45-
-Dorg.gradle.jvmargs=-Xms2g -Dorg.gradle.jvmargs=-Xmx6g -Dorg.gradle.vfs.watch=false -Pdocker-pull-licenses \
45+
-Dorg.gradle.jvmargs=-Xms2g -Dorg.gradle.jvmargs=-Xmx6g -Dorg.gradle.vfs.watch=false \
4646
${{ inputs.arguments }}
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": 2
3+
"modification": 4
44
}

.github/workflows/beam_PreCommit_GoPortable.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ env:
3838
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3939
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
4040
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
41+
# TODO(https://github.com/grpc/grpc/issues/37710): Remove once fixed.
42+
GRPC_ENABLE_FORK_SUPPORT: '0'
4143

4244
# Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
4345
permissions:
@@ -86,4 +88,5 @@ jobs:
8688
- name: Run goPortablePreCommit script
8789
uses: ./.github/actions/gradle-command-self-hosted-action
8890
with:
89-
gradle-command: :goPortablePreCommit
91+
gradle-command: :goPortablePreCommit
92+
arguments: -Pdocker-pull-licenses

.github/workflows/beam_PreCommit_Java_Examples_Dataflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
arguments: |
106106
-PdisableSpotlessCheck=true \
107107
-PdisableCheckStyle=true \
108+
-Pdocker-pull-licenses \
108109
- name: Archive JUnit Test Results
109110
uses: actions/upload-artifact@v4
110111
if: ${{ !success() }}

.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ jobs:
119119
-PtestJavaVersion=21 \
120120
-PskipCheckerFramework \
121121
-Pjava21Home=$JAVA_HOME_21_X64 \
122+
-Pdocker-pull-licenses \
122123
max-workers: 12
123124
- name: Archive JUnit Test Results
124125
uses: actions/upload-artifact@v4

.github/workflows/beam_PreCommit_PythonDocker.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,5 @@ jobs:
102102
gradle-command: :sdks:python:container:py${{steps.set_py_ver_clean.outputs.py_ver_clean}}:docker
103103
arguments: |
104104
-Pposargs=apache_beam/dataframe/ \
105-
-PpythonVersion=${{ matrix.python_version }}
105+
-PpythonVersion=${{ matrix.python_version }} \
106+
-Pdocker-pull-licenses

.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,4 @@ jobs:
127127
-Pdocker-tag-list=${{ github.sha }},${BEAM_VERSION}${LATEST_TAG} \
128128
-Pcontainer-architecture-list=arm64,amd64 \
129129
-Ppush-containers \
130+
-Pdocker-pull-licenses

.github/workflows/beam_Publish_Docker_Snapshots.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@ jobs:
8282
gradle-command: :runners:spark:3:job-server:container:dockerPush
8383
arguments: |
8484
-Pdocker-repository-root=gcr.io/apache-beam-testing/beam_portability \
85-
-Pdocker-tag-list=${{ github.sha }}${LATEST_TAG}
85+
-Pdocker-tag-list=${{ github.sha }}${LATEST_TAG} \
86+
-Pdocker-pull-licenses
8687
- name: run Publish Docker Snapshots script for Flink 1.17
8788
uses: ./.github/actions/gradle-command-self-hosted-action
8889
with:
8990
gradle-command: :runners:flink:1.17:job-server-container:dockerPush
9091
arguments: |
9192
-Pdocker-repository-root=gcr.io/apache-beam-testing/beam_portability \
92-
-Pdocker-tag-list=${{ github.sha }}${LATEST_TAG}
93+
-Pdocker-tag-list=${{ github.sha }}${LATEST_TAG} \
94+
-Pdocker-pull-licenses

.github/workflows/build_wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ on:
2525
push:
2626
branches: ['master', 'release-*']
2727
tags: 'v*'
28+
paths: ['sdks/python/**', 'model/**', 'release/**']
2829
pull_request:
2930
branches: ['master', 'release-*']
30-
tags: 'v*'
3131
paths: ['sdks/python/**', 'model/**', 'release/**']
3232
workflow_dispatch:
3333

@@ -244,13 +244,13 @@ jobs:
244244
- name: Install Python
245245
uses: actions/setup-python@v5
246246
with:
247-
python-version: '3.10'
247+
python-version: '3.11'
248248
- uses: docker/setup-qemu-action@v3
249249
if: ${{matrix.os_python.arch == 'aarch64'}}
250250
name: Set up QEMU
251251
- name: Install cibuildwheel
252252
# note: sync cibuildwheel version with gradle task sdks:python:bdistPy* steps
253-
run: pip install cibuildwheel==2.23.3 setuptools
253+
run: pip install cibuildwheel==3.4.0 setuptools
254254
- name: Build wheel
255255
# Only build wheel if it is one of the target versions for this platform, otherwise no-op
256256
if: ${{ contains(matrix.os_python.python, matrix.py_version) }}

.github/workflows/load-tests-pipeline-options/beam_CloudML_Benchmarks_Dataflow_arguments.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
--staging_location=gs://temp-storage-for-perf-tests/loadtests
2121
--temp_location=gs://temp-storage-for-perf-tests/loadtests
2222
--runner=DataflowRunner
23-
--requirements_file=apache_beam/testing/benchmarks/cloudml/requirements.txt
23+
--requirements_file=apache_beam/testing/benchmarks/cloudml/requirements.txt

0 commit comments

Comments
 (0)