Skip to content

Commit 19a220d

Browse files
authored
Merge pull request #37935 from apache/cp-37927
Cherrypick #37927
2 parents d66713f + cf88d3f commit 19a220d

18 files changed

Lines changed: 38 additions & 38 deletions

.github/workflows/beam_CleanUpGCPResources.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: [self-hosted, ubuntu-20.04, main]
5555
timeout-minutes: 100
5656
strategy:
57-
matrix:
57+
matrix:
5858
job_name: [beam_CleanUpGCPResources]
5959
job_phrase: [Run Clean GCP Resources]
6060
if: |
@@ -74,10 +74,10 @@ jobs:
7474
with:
7575
disable-cache: true
7676
- name: Setup gcloud
77-
uses: google-github-actions/setup-gcloud@v3
77+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
7878
- name: Install gcloud bigtable cli
7979
run: gcloud components install cbt
8080
- name: run cleanup GCP resources
8181
uses: ./.github/actions/gradle-command-self-hosted-action
8282
with:
83-
gradle-command: :beam-test-tools:cleanupOtherStaleResources
83+
gradle-command: :beam-test-tools:cleanupOtherStaleResources

.github/workflows/beam_Infrastructure_PolicyEnforcer.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ jobs:
4343
timeout-minutes: 30
4444
steps:
4545
- uses: actions/checkout@v4
46-
46+
4747
- name: Setup Python
4848
uses: actions/setup-python@v4
4949
with:
5050
python-version: '3.13'
51-
51+
5252
- name: Install Python dependencies
5353
working-directory: ./infra/enforcement
5454
run: |
5555
python -m pip install --upgrade pip
5656
pip install -r requirements.txt
57-
57+
5858
- name: Setup gcloud
59-
uses: google-github-actions/setup-gcloud@v3
60-
59+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
60+
6161
- name: Run IAM Policy Enforcement
6262
working-directory: ./infra/enforcement
6363
env:

.github/workflows/beam_Infrastructure_SecurityLogging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs:
5656
run: |
5757
python -m pip install --upgrade pip
5858
pip install -r requirements.txt
59-
59+
6060
- name: Setup gcloud
61-
uses: google-github-actions/setup-gcloud@v3
61+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
6262

6363
- name: Initialize Log Sinks
6464
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'

.github/workflows/beam_Infrastructure_ServiceAccountKeys.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
steps:
5151
- uses: actions/checkout@v4
5252
- name: Setup gcloud
53-
uses: google-github-actions/setup-gcloud@v3
53+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
5454

5555
- name: Setup Python
5656
uses: actions/setup-python@v4
@@ -62,7 +62,7 @@ jobs:
6262
run: |
6363
python -m pip install --upgrade pip
6464
pip install -r requirements.txt
65-
65+
6666
- name: Run Service Account Key Management
6767
working-directory: ./infra/keys
6868
run: python keys.py --cron-dry-run

.github/workflows/beam_Infrastructure_UsersPermissions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
ref: ${{ github.event.pull_request.merged == true && github.base_ref || github.event.pull_request.head.sha }}
5151
- name: Setup gcloud
52-
uses: google-github-actions/setup-gcloud@v3
52+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
5353
- name: Install Terraform
5454
uses: hashicorp/setup-terraform@v3
5555
with:

.github/workflows/beam_Playground_Precommit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
sudo apt-get install sbt --yes
7676
sudo wget https://codeload.github.com/spotify/scio.g8/zip/7c1ba7c1651dfd70976028842e721da4107c0d6d -O scio.g8.zip && unzip scio.g8.zip && sudo mv scio.g8-7c1ba7c1651dfd70976028842e721da4107c0d6d /opt/scio.g8
7777
- name: Set up Cloud SDK and its components
78-
uses: google-github-actions/setup-gcloud@v3
78+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
7979
with:
8080
install_components: 'beta,cloud-datastore-emulator'
8181
version: '${{ env.DATASTORE_EMULATOR_VERSION }}'

.github/workflows/beam_PostCommit_Python_Arm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ jobs:
8484
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
8585
sudo chmod +x /usr/local/bin/docker-compose
8686
- name: Authenticate on GCP
87-
uses: google-github-actions/auth@v3
87+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093
8888
with:
8989
service_account: ${{ secrets.GCP_SA_EMAIL }}
9090
credentials_json: ${{ secrets.GCP_SA_KEY }}
9191
- name: Set up Cloud SDK
92-
uses: google-github-actions/setup-gcloud@v3
92+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
9393
- name: Set up Docker Buildx
94-
uses: docker/setup-buildx-action@v3
94+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
9595
- name: GCloud Docker credential helper
9696
run: |
9797
gcloud auth configure-docker us.gcr.io

.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ jobs:
8080
java-version: default
8181
python-version: ${{ matrix.python_version }}
8282
- name: Authenticate to GCP
83-
uses: google-github-actions/auth@v3
83+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093
8484
with:
8585
service_account: ${{ secrets.GCP_SA_EMAIL }}
8686
credentials_json: ${{ secrets.GCP_SA_KEY }}
8787
- name: Set up Cloud SDK
88-
uses: google-github-actions/setup-gcloud@v3
88+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
8989
- name: Configure Docker auth for GCR
9090
run: |
9191
gcloud --quiet auth configure-docker us.gcr.io

.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ jobs:
8282
java-version: default
8383
python-version: ${{ matrix.python_version }}
8484
- name: Authenticate to GCP
85-
uses: google-github-actions/auth@v3
85+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093
8686
with:
8787
service_account: ${{ secrets.GCP_SA_EMAIL }}
8888
credentials_json: ${{ secrets.GCP_SA_KEY }}
8989
- name: Set up Cloud SDK
90-
uses: google-github-actions/setup-gcloud@v3
90+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
9191
- name: Set PY_VER_CLEAN
9292
id: set_py_ver_clean
9393
run: |
@@ -125,4 +125,4 @@ jobs:
125125
commit: '${{ env.prsha || env.GITHUB_SHA }}'
126126
comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }}
127127
files: '**/pytest*.xml'
128-
large_files: true
128+
large_files: true

.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
python-version: default
7777
java-version: '11'
7878
- name: Set up Cloud SDK
79-
uses: google-github-actions/setup-gcloud@v3
79+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
8080
- name: run PostCommit Yaml Xlang Direct script
8181
uses: ./.github/actions/gradle-command-self-hosted-action
8282
with:

0 commit comments

Comments
 (0)