Skip to content

Commit 1e2aa39

Browse files
committed
GH-46075: [Release][CI] Fix binary verification (#46076)
### Rationale for this change ### What changes are included in this PR? ### Are these changes tested? ### Are there any user-facing changes? **This PR includes breaking changes to public APIs.** (If there are any breaking changes to public APIs, please explain which changes are breaking. If not, you can remove this.) **This PR contains a "Critical Fix".** (If the changes fix either (a) a security vulnerability, (b) a bug that caused incorrect or invalid data to be produced, or (c) a bug that causes a crash (even when the API contract is upheld), please provide explanation. If not, you can remove this.) * GitHub Issue: #46075 Authored-by: Jacob Wujciak-Jens <[email protected]> Signed-off-by: Jacob Wujciak-Jens <[email protected]>
1 parent e635e05 commit 1e2aa39

File tree

4 files changed

+155
-108
lines changed

4 files changed

+155
-108
lines changed

.github/workflows/verify_rc.yml

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,24 @@ on:
2121
push:
2222
tags:
2323
- "*-rc*"
24+
pull_request:
25+
paths:
26+
- ".github/workflows/verify_rc.yml"
27+
workflow_dispatch:
28+
inputs:
29+
rc_tag:
30+
description: "Tag of the rc to verify"
31+
type: string
32+
required: true
33+
2434

2535
permissions:
2636
contents: read
2737

2838
env:
2939
TEST_DEFAULT: "0"
3040
VERBOSE: "1"
41+
RC_TAG: "${{ inputs.rc_tag || github.event_name == 'pull_request' && 'apache-arrow-20.0.0-rc0' || github.ref_name }}"
3142

3243
jobs:
3344
apt:
@@ -46,9 +57,9 @@ jobs:
4657
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4758
- name: Run
4859
run: |
49-
package_id=${GITHUB_REF_NAME%-rc*}
60+
package_id=${RC_TAG%-rc*}
5061
version=${package_id#apache-arrow-}
51-
rc=${GITHUB_REF_NAME#*-rc}
62+
rc=${RC_TAG#*-rc}
5263
dev/release/verify-release-candidate.sh ${version} ${rc}
5364
5465
binary:
@@ -61,9 +72,9 @@ jobs:
6172
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6273
- name: Run
6374
run: |
64-
package_id=${GITHUB_REF_NAME%-rc*}
75+
package_id=${RC_TAG%-rc*}
6576
version=${package_id#apache-arrow-}
66-
rc=${GITHUB_REF_NAME#*-rc}
77+
rc=${RC_TAG#*-rc}
6778
dev/release/verify-release-candidate.sh ${version} ${rc}
6879
6980
wheels-linux:
@@ -89,9 +100,9 @@ jobs:
89100
run: python -m pip install -e dev/archery[docker]
90101
- name: Prepare
91102
run: |
92-
package_id=${GITHUB_REF_NAME%-rc*}
103+
package_id=${RC_TAG%-rc*}
93104
echo "VERSION=${package_id#apache-arrow-}" >> ${GITHUB_ENV}
94-
echo "RC=${GITHUB_REF_NAME#*-rc}" >> ${GITHUB_ENV}
105+
echo "RC=${RC_TAG#*-rc}" >> ${GITHUB_ENV}
95106
distro=${{ matrix.distro }}
96107
if [ "${distro}" = "conda" ]; then
97108
echo "SERVICE=${distro}-verify-rc" >> ${GITHUB_ENV}
@@ -102,13 +113,16 @@ jobs:
102113
echo "$(echo ${os} | tr a-z A-Z)=${version}" >> ${GITHUB_ENV}
103114
fi
104115
- name: Run
116+
env:
117+
GH_TOKEN: ${{ github.token }}
105118
run: |
106119
archery docker run \
107120
-e TEST_DEFAULT="${TEST_DEFAULT}" \
108121
-e TEST_WHEELS="${TEST_WHEELS}" \
109122
-e VERBOSE="${VERBOSE}" \
110123
-e VERIFY_RC="${RC}" \
111124
-e VERIFY_VERSION="${VERSION}" \
125+
-e GH_TOKEN="$GH_TOKEN" \
112126
${SERVICE}
113127
114128
wheels-macos:
@@ -126,10 +140,12 @@ jobs:
126140
steps:
127141
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
128142
- name: Run
143+
env:
144+
GH_TOKEN: ${{ github.token }}
129145
run: |
130-
package_id=${GITHUB_REF_NAME%-rc*}
146+
package_id=${RC_TAG%-rc*}
131147
version=${package_id#apache-arrow-}
132-
rc=${GITHUB_REF_NAME#*-rc}
148+
rc=${RC_TAG#*-rc}
133149
dev/release/verify-release-candidate.sh ${version} ${rc}
134150
135151
wheels-windows:
@@ -141,12 +157,14 @@ jobs:
141157
TEST_WHEELS: "1"
142158
steps:
143159
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
160+
with:
161+
submodules: recursive
144162
- name: Prepare
145163
shell: bash
146164
run: |
147-
package_id=${GITHUB_REF_NAME%-rc*}
165+
package_id=${RC_TAG%-rc*}
148166
echo "VERSION=${package_id#apache-arrow-}" >> ${GITHUB_ENV}
149-
echo "RC=${GITHUB_REF_NAME#*-rc}" >> ${GITHUB_ENV}
167+
echo "RC=${RC_TAG#*-rc}" >> ${GITHUB_ENV}
150168
- uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
151169
- name: Install System Dependencies
152170
run: |
@@ -156,6 +174,8 @@ jobs:
156174
shell: bash
157175
run: ci/scripts/download_tz_database.sh
158176
- name: Run verification
177+
env:
178+
GH_TOKEN: ${{ github.token }}
159179
shell: cmd
160180
run: |
161181
dev/release/verify-release-candidate-wheels.bat %VERSION% %RC%
@@ -176,7 +196,7 @@ jobs:
176196
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
177197
- name: Run
178198
run: |
179-
package_id=${GITHUB_REF_NAME%-rc*}
199+
package_id=${RC_TAG%-rc*}
180200
version=${package_id#apache-arrow-}
181-
rc=${GITHUB_REF_NAME#*-rc}
201+
rc=${RC_TAG#*-rc}
182202
dev/release/verify-release-candidate.sh ${version} ${rc}

0 commit comments

Comments
 (0)