Skip to content

Commit e5dcda5

Browse files
committed
Use setup-jfrog composite action and protected runner group
Replace inline JFrog OIDC token exchange with the shared .github/actions/setup-jfrog composite action in both jobs. Switch to databricks-protected-runner-group-large runner group. Co-authored-by: Isaac
1 parent 499cc0d commit e5dcda5

File tree

1 file changed

+8
-55
lines changed

1 file changed

+8
-55
lines changed

.github/workflows/release-build.yml

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
name: sign
1717
deployment: false
1818
runs-on:
19-
group: databricks-deco-testing-runner-group
20-
labels: ubuntu-latest-deco
19+
group: databricks-protected-runner-group-large
20+
labels: linux-ubuntu-latest-large
2121

2222
permissions:
2323
id-token: write
@@ -30,35 +30,8 @@ jobs:
3030
fetch-depth: 0
3131
fetch-tags: true
3232

33-
- name: Get JFrog OIDC token
34-
run: |
35-
set -euo pipefail
36-
# Exchange GitHub OIDC token for JFrog access token.
37-
ID_TOKEN=$(curl -sLS \
38-
-H "User-Agent: actions/oidc-client" \
39-
-H "Authorization: Bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" \
40-
"${ACTIONS_ID_TOKEN_REQUEST_URL}&audience=jfrog-github" | jq -r .value)
41-
echo "::add-mask::${ID_TOKEN}"
42-
ACCESS_TOKEN=$(curl -sLS -XPOST -H "Content-Type: application/json" \
43-
"https://databricks.jfrog.io/access/api/v1/oidc/token" \
44-
-d "{\"grant_type\": \"urn:ietf:params:oauth:grant-type:token-exchange\", \"subject_token_type\":\"urn:ietf:params:oauth:token-type:id_token\", \"subject_token\": \"${ID_TOKEN}\", \"provider_name\": \"github-actions\"}" | jq -r .access_token)
45-
echo "::add-mask::${ACCESS_TOKEN}"
46-
if [ -z "$ACCESS_TOKEN" ] || [ "$ACCESS_TOKEN" = "null" ]; then
47-
echo "FAIL: Could not extract JFrog access token"
48-
exit 1
49-
fi
50-
echo "JFROG_ACCESS_TOKEN=${ACCESS_TOKEN}" >> "$GITHUB_ENV"
51-
52-
- name: Configure Go to use JFrog proxy
53-
run: |
54-
echo "GOPROXY=https://databricks.jfrog.io/artifactory/api/go/db-golang,direct" >> "$GITHUB_ENV"
55-
echo "GONOSUMDB=*" >> "$GITHUB_ENV"
56-
cat > ~/.netrc << EOF
57-
machine databricks.jfrog.io
58-
login gha-service-account
59-
password ${JFROG_ACCESS_TOKEN}
60-
EOF
61-
chmod 600 ~/.netrc
33+
- name: Setup JFrog
34+
uses: ./.github/actions/setup-jfrog
6235

6336
- name: Setup Go
6437
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
@@ -148,8 +121,8 @@ jobs:
148121
149122
python-wheel:
150123
runs-on:
151-
group: databricks-deco-testing-runner-group
152-
labels: ubuntu-latest-deco
124+
group: databricks-protected-runner-group-large
125+
labels: linux-ubuntu-latest-large
153126

154127
permissions:
155128
id-token: write
@@ -162,28 +135,8 @@ jobs:
162135
fetch-depth: 0
163136
fetch-tags: true
164137

165-
- name: Get JFrog OIDC token
166-
run: |
167-
set -euo pipefail
168-
# Exchange GitHub OIDC token for JFrog access token.
169-
ID_TOKEN=$(curl -sLS \
170-
-H "User-Agent: actions/oidc-client" \
171-
-H "Authorization: Bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" \
172-
"${ACTIONS_ID_TOKEN_REQUEST_URL}&audience=jfrog-github" | jq -r .value)
173-
echo "::add-mask::${ID_TOKEN}"
174-
ACCESS_TOKEN=$(curl -sLS -XPOST -H "Content-Type: application/json" \
175-
"https://databricks.jfrog.io/access/api/v1/oidc/token" \
176-
-d "{\"grant_type\": \"urn:ietf:params:oauth:grant-type:token-exchange\", \"subject_token_type\":\"urn:ietf:params:oauth:token-type:id_token\", \"subject_token\": \"${ID_TOKEN}\", \"provider_name\": \"github-actions\"}" | jq -r .access_token)
177-
echo "::add-mask::${ACCESS_TOKEN}"
178-
if [ -z "$ACCESS_TOKEN" ] || [ "$ACCESS_TOKEN" = "null" ]; then
179-
echo "FAIL: Could not extract JFrog access token"
180-
exit 1
181-
fi
182-
echo "JFROG_ACCESS_TOKEN=${ACCESS_TOKEN}" >> "$GITHUB_ENV"
183-
184-
- name: Configure uv to use JFrog PyPI proxy
185-
run: |
186-
echo "UV_INDEX_URL=https://gha-service-account:${JFROG_ACCESS_TOKEN}@databricks.jfrog.io/artifactory/api/pypi/db-pypi/simple" >> "$GITHUB_ENV"
138+
- name: Setup JFrog
139+
uses: ./.github/actions/setup-jfrog
187140

188141
- name: Install uv
189142
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0

0 commit comments

Comments
 (0)