Skip to content

Commit 7f925e2

Browse files
authored
Merge branch 'master' into drain-docs-update
2 parents b21b9e3 + f01b9dd commit 7f925e2

86 files changed

Lines changed: 2954 additions & 639 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/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ updates:
2424
schedule:
2525
interval: "daily"
2626
exclude-paths:
27-
- "/sdks/python/container/**"
27+
- "container/**"
2828
- package-ecosystem: "gradle"
2929
directory: "/" # Location of package manifests
3030
schedule:

.github/trigger_files/beam_PostCommit_Go_VR_Flink.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
33
"modification": 2,
44
"https://github.com/apache/beam/pull/32440": "testing datastream optimizations",
5+
"pr": "37640"
56
}

.github/trigger_files/beam_PostCommit_Java_DataflowV1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"https://github.com/apache/beam/pull/34902": "Introducing OutputBuilder",
44
"https://github.com/apache/beam/pull/35177": "Introducing WindowedValueReceiver to runners",
55
"comment": "Modify this file in a trivial way to cause this test suite to run",
6-
"modification": 4,
6+
"modification": 9,
77
"https://github.com/apache/beam/pull/35159": "moving WindowedValue and making an interface"
88
}

.github/workflows/assign_milestone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
fetch-depth: 2
3737

38-
- uses: actions/github-script@v8
38+
- uses: actions/github-script@v9
3939
with:
4040
script: |
4141
const fs = require('fs')

.github/workflows/beam_Infrastructure_UsersPermissions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Setup gcloud
5252
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
5353
- name: Install Terraform
54-
uses: hashicorp/setup-terraform@v3
54+
uses: hashicorp/setup-terraform@v4
5555
with:
5656
terraform_version: 1.12.2
5757
- name: Initialize Terraform

.github/workflows/beam_PostCommit_Python_Versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
8989
github.event_name == 'workflow_dispatch'
9090
steps:
91-
- uses: actions/checkout@v4
91+
- uses: actions/checkout@v6
9292
- name: Setup repository
9393
uses: ./.github/actions/setup-action
9494
with:
@@ -134,7 +134,7 @@ jobs:
134134
-PpythonVersion=${{ matrix.python_version }} \
135135
-Pposargs="--ignore=apache_beam/ml/" \
136136
- name: Archive Python Test Results
137-
uses: actions/upload-artifact@v4
137+
uses: actions/upload-artifact@v7
138138
if: failure()
139139
with:
140140
name: Python ${{ matrix.python_version }} Test Results

.github/workflows/beam_PreCommit_Java_Dataflow.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
github.event_name == 'workflow_dispatch' ||
7878
github.event.comment.body == 'Run Java Dataflow Non-portable Worker PreCommit'
7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v6
8181
- name: Setup repository
8282
uses: ./.github/actions/setup-action
8383
with:
@@ -99,7 +99,7 @@ jobs:
9999
-PdisableCheckStyle=true \
100100
-PenableJacocoReport
101101
- name: Archive JUnit Test Results
102-
uses: actions/upload-artifact@v4
102+
uses: actions/upload-artifact@v7
103103
if: ${{ !success() }}
104104
with:
105105
name: JUnit Test Results
@@ -113,7 +113,7 @@ jobs:
113113
files: '**/build/test-results/**/*.xml'
114114
large_files: true
115115
- name: Archive SpotBugs Results
116-
uses: actions/upload-artifact@v4
116+
uses: actions/upload-artifact@v7
117117
if: always()
118118
with:
119119
name: SpotBugs Results
@@ -125,7 +125,7 @@ jobs:
125125
name: Publish SpotBugs
126126
path: '**/build/reports/spotbugs/*.html'
127127
- name: Archive Jacoco Results
128-
uses: actions/upload-artifact@v4
128+
uses: actions/upload-artifact@v7
129129
with:
130130
name: Jacoco Results
131131
path: '**/build/jacoco/report/**'

.github/workflows/build_release_candidate.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
11
7575
- name: Import GPG key
7676
id: import_gpg
77-
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec
77+
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd
7878
with:
7979
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
8080
- name: Auth for nexus
@@ -126,7 +126,7 @@ jobs:
126126
java-version: '11'
127127
- name: Import GPG key
128128
id: import_gpg
129-
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec
129+
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd
130130
with:
131131
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
132132
- name: stage source
@@ -193,7 +193,7 @@ jobs:
193193
disable-cache: true
194194
- name: Import GPG key
195195
id: import_gpg
196-
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec
196+
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd
197197
with:
198198
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
199199
- name: Install dependencies
@@ -293,7 +293,7 @@ jobs:
293293
# settings.xml file
294294
run: rm ~/.m2/settings.xml || true
295295
- name: Login to Docker Hub
296-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2
296+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121
297297
with:
298298
username: ${{ secrets.DOCKERHUB_USER }}
299299
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -455,7 +455,7 @@ jobs:
455455
go-version: '1.26'
456456
- name: Import GPG key
457457
id: import_gpg
458-
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec
458+
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd
459459
with:
460460
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
461461
- name: Build prism artifacts

.github/workflows/build_runner_image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Set up Docker Buildx
4848
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
4949
- name: Build and Load to docker
50-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
50+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f
5151
with:
5252
context: ${{ env.working-directory }}
5353
load: true
@@ -57,7 +57,7 @@ jobs:
5757
- name: Push Docker image
5858
if: github.ref == 'refs/heads/master'
5959
id: docker_build
60-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
60+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f
6161
with:
6262
context: ${{ env.working-directory }}
6363
push: true

.github/workflows/build_wheels.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
if: needs.check_env_variables.outputs.gcp-variables-set == 'true'
203203
steps:
204204
- name: Download compressed sources from artifacts
205-
uses: actions/download-artifact@v7
205+
uses: actions/download-artifact@v8
206206
with:
207207
name: source_zip
208208
path: source/
@@ -231,13 +231,13 @@ jobs:
231231
py_version: ["cp310-", "cp311-", "cp312-", "cp313-", "cp314-"]
232232
steps:
233233
- name: Download python source distribution from artifacts
234-
uses: actions/download-artifact@v7
234+
uses: actions/download-artifact@v8
235235
with:
236236
name: source
237237
path: apache-beam-source
238238
- name: Download Python SDK RC source distribution from artifacts
239239
if: ${{ needs.build_source.outputs.is_rc == 1 }}
240-
uses: actions/download-artifact@v7
240+
uses: actions/download-artifact@v8
241241
with:
242242
name: source_rc${{ needs.build_source.outputs.rc_num }}
243243
path: apache-beam-source-rc
@@ -314,7 +314,7 @@ jobs:
314314
if: needs.check_env_variables.outputs.gcp-variables-set == 'true' && github.event_name != 'pull_request'
315315
steps:
316316
- name: Download wheels from artifacts
317-
uses: actions/download-artifact@v7
317+
uses: actions/download-artifact@v8
318318
with:
319319
pattern: wheelhouse-*
320320
merge-multiple: true

0 commit comments

Comments
 (0)