Skip to content

Commit cd2c19a

Browse files
Merge pull request #1405 from getsentry/revert-1404-fix/gha-oidc-collect-and-deploy
Revert "fix: switch github actions to workload identity"
2 parents 9834d7f + c5b0f34 commit cd2c19a

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ 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
6057
steps:
6158
- uses: actions/checkout@v3
6259
- uses: actions/setup-python@v4
@@ -67,8 +64,8 @@ jobs:
6764
with:
6865
path: dist
6966
- run: python3 -um make_index --pypi-url https://pypi.devinfra.sentry.io --dest index
70-
- uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
67+
- uses: google-github-actions/auth@v0
7168
with:
72-
workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
73-
service_account: [email protected]
69+
credentials_json: ${{ secrets.PYPI_DEVINFRA_SENTRY_IO }}
70+
- run: yes | gcloud auth login --cred-file="$GOOGLE_APPLICATION_CREDENTIALS"
7471
- run: python3 -uS bin/upload-artifacts

packages.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ 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
105103

106104
[blinker==1.4]
107105
[blinker==1.5]
@@ -1018,7 +1016,6 @@ python_versions = <3.13
10181016

10191017
[mypy-extensions==0.4.3]
10201018
[mypy-extensions==1.0.0]
1021-
[mypy-extensions==1.1.0]
10221019

10231020
[myst-parser==0.18.0]
10241021

@@ -1081,7 +1078,6 @@ python_versions = <3.13
10811078
[packaging==24.0]
10821079
[packaging==24.1]
10831080
[packaging==24.2]
1084-
[packaging==25.0]
10851081

10861082
[paramiko==2.11.0]
10871083
[paramiko==3.4.0]
@@ -1173,7 +1169,6 @@ python_versions = <3.13
11731169
[platformdirs==4.2.0]
11741170
[platformdirs==4.2.2]
11751171
[platformdirs==4.3.6]
1176-
[platformdirs==4.3.7]
11771172

11781173
[pluggy==0.13.1]
11791174
[pluggy==1.0.0]

0 commit comments

Comments
 (0)