Skip to content

Commit 9834d7f

Browse files
Merge pull request #1404 from getsentry/fix/gha-oidc-collect-and-deploy
fix: switch github actions to workload identity
2 parents 2ea460d + b3bf72f commit 9834d7f

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ jobs:
5454
needs: [linux, macos]
5555
if: github.event_name != 'pull_request'
5656
runs-on: ubuntu-latest
57+
permissions:
58+
id-token: write
59+
contents: read
5760
steps:
5861
- uses: actions/checkout@v3
5962
- uses: actions/setup-python@v4
@@ -64,8 +67,8 @@ jobs:
6467
with:
6568
path: dist
6669
- run: python3 -um make_index --pypi-url https://pypi.devinfra.sentry.io --dest index
67-
- uses: google-github-actions/auth@v0
70+
- uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
6871
with:
69-
credentials_json: ${{ secrets.PYPI_DEVINFRA_SENTRY_IO }}
70-
- run: yes | gcloud auth login --cred-file="$GOOGLE_APPLICATION_CREDENTIALS"
72+
workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
73+
service_account: [email protected]
7174
- run: python3 -uS bin/upload-artifacts

packages.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ validate_extras = d
100100
validate_extras = d
101101
[black==24.10.0]
102102
validate_extras = d
103+
[black==25.1.0]
104+
validate_extras = d
103105

104106
[blinker==1.4]
105107
[blinker==1.5]
@@ -1016,6 +1018,7 @@ python_versions = <3.13
10161018

10171019
[mypy-extensions==0.4.3]
10181020
[mypy-extensions==1.0.0]
1021+
[mypy-extensions==1.1.0]
10191022

10201023
[myst-parser==0.18.0]
10211024

@@ -1078,6 +1081,7 @@ python_versions = <3.13
10781081
[packaging==24.0]
10791082
[packaging==24.1]
10801083
[packaging==24.2]
1084+
[packaging==25.0]
10811085

10821086
[paramiko==2.11.0]
10831087
[paramiko==3.4.0]
@@ -1169,6 +1173,7 @@ python_versions = <3.13
11691173
[platformdirs==4.2.0]
11701174
[platformdirs==4.2.2]
11711175
[platformdirs==4.3.6]
1176+
[platformdirs==4.3.7]
11721177

11731178
[pluggy==0.13.1]
11741179
[pluggy==1.0.0]

0 commit comments

Comments
 (0)