-
Notifications
You must be signed in to change notification settings - Fork 4.1k
GH-49686: [C++][FlightRPC][ODBC][Release] Create signing script for Windows FlightSQL ODBC build #49788
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
amoeba
wants to merge
22
commits into
apache:main
Choose a base branch
from
amoeba:GH-49560--flightsql-release-signing
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
GH-49686: [C++][FlightRPC][ODBC][Release] Create signing script for Windows FlightSQL ODBC build #49788
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
817b479
Create new signing script
amoeba 61e7503
remove the unsigned dll from the release
amoeba 0f1f391
Update dev/release/07-flightsqlodbc-upload.sh
amoeba f120e3c
remove old scripts
amoeba 12b503b
add step to release.rst
amoeba 31a99fb
Update pre-commit
amoeba 62265bd
Put env vars in .env.example
amoeba 92a8ae8
Use fixed local temp dir
amoeba 5b01a0f
use --interval
amoeba 6717e34
fix shellcheck issues in script
amoeba 33866c7
fix latent bug in is_signed
amoeba 47ec038
Fix bug with filename
amoeba 7f0e6e0
make it so the grep doesn't fail the script early
amoeba ff033b6
testing, should revert: add libuv1-dev
amoeba 7b99cd6
Revert "testing, should revert: add libuv1-dev"
amoeba 81b1e88
move env var checks after utils-env
amoeba fa646fc
add 07 script to shfmt
amoeba 402b75f
use :=
amoeba d051f0b
use 'rc-number' for consistency
amoeba 07a4328
rename 09-vote-email to 10-vote-email
amoeba ac39888
remove step deleting unsigned dll
amoeba df22a8e
Use watch-gh-workflow script
amoeba File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| # | ||
| # FlightSQL ODBC Release Signing Script | ||
| # | ||
| # This script handles the signing of FlightSQL ODBC Windows binaries and MSI | ||
| # installer. It requires jsign to be configured with ASF code signing | ||
| # credentials. Keep reading below: | ||
|
amoeba marked this conversation as resolved.
|
||
| # | ||
| # Required environment variables: | ||
| # | ||
| # ESIGNER_STOREPASS - The ssl.com credentials in "username|password" format | ||
| # ESIGNER_KEYPASS - The ssl.com eSigner secret code (not the PIN) | ||
| # | ||
| # Set these in .env. | ||
| # | ||
| # How to get ESIGNER_KEYPASS: | ||
| # | ||
| # 1. Log into ssl.com | ||
| # 2. In your Dashboard, under "invitations", click the link under the order. Or | ||
| # go to Orders, find the order, expand the order, and click "certificate | ||
| # details" | ||
| # 3. Enter your PIN to get your OTP. This is ESIGNER_KEYPASS. | ||
| # | ||
| # If you don't have access, see https://infra.apache.org/code-signing-use.html. | ||
|
|
||
| set -e | ||
| set -u | ||
| set -o pipefail | ||
|
|
||
| SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" | ||
|
|
||
| if [ "$#" -ne 2 ]; then | ||
| echo "Usage: $0 <version> <rc-num>" | ||
| exit 1 | ||
| fi | ||
|
|
||
| . "${SOURCE_DIR}/utils-env.sh" | ||
|
|
||
| if [ -z "${ESIGNER_STOREPASS:-}" ]; then | ||
| echo "ERROR: ESIGNER_STOREPASS is not set" >&2 | ||
| exit 1 | ||
| fi | ||
| if [ -z "${ESIGNER_KEYPASS:-}" ]; then | ||
| echo "ERROR: ESIGNER_KEYPASS is not set" >&2 | ||
| exit 1 | ||
| fi | ||
|
amoeba marked this conversation as resolved.
Comment on lines
+56
to
+63
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you move them after
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Whoops. Fixed in 81b1e88. |
||
|
|
||
| version=$1 | ||
| rc=$2 | ||
|
|
||
| version_with_rc="${version}-rc${rc}" | ||
| tag="apache-arrow-${version_with_rc}" | ||
|
|
||
| dll_unsigned="arrow_flight_sql_odbc_unsigned.dll" | ||
| dll_signed="arrow_flight_sql_odbc.dll" | ||
|
|
||
| : "${GITHUB_REPOSITORY:=apache/arrow}" | ||
|
|
||
| : "${PHASE_DEFAULT:=1}" | ||
| : "${PHASE_SIGN_DLL:=${PHASE_DEFAULT}}" | ||
| : "${PHASE_BUILD_MSI:=${PHASE_DEFAULT}}" | ||
| : "${PHASE_SIGN_MSI:=${PHASE_DEFAULT}}" | ||
|
|
||
| if [ "${PHASE_SIGN_DLL}" -eq 0 ] && [ "${PHASE_BUILD_MSI}" -eq 0 ] && [ "${PHASE_SIGN_MSI}" -eq 0 ]; then | ||
| echo "No phases specified. Exiting." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Utility function to use jsign to check if a file is signed or not | ||
| is_signed() { | ||
| local file="$1" | ||
| local exit_code=0 | ||
| jsign extract --format PEM "${file}" >/dev/null 2>&1 || exit_code=$? | ||
| # jsign writes a PEM file even though it also prints to stdout. Clean up after | ||
| # it. Use -f since so it still runs on unsigned files without error. | ||
| rm -f "${file}.sig.pem" | ||
| return ${exit_code} | ||
| } | ||
|
amoeba marked this conversation as resolved.
|
||
|
|
||
| # Use dev/release/tmp for temporary files | ||
| tmp_dir="${SOURCE_DIR}/tmp" | ||
| if [ -e "${tmp_dir}" ]; then | ||
| echo "ERROR: temp dir already exists: ${tmp_dir}. Remove it manually and run again." >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ "${PHASE_SIGN_DLL}" -gt 0 ]; then | ||
| echo "[1/8 Downloading ${dll_unsigned} from release..." | ||
| gh release download "${tag}" \ | ||
| --repo "${GITHUB_REPOSITORY}" \ | ||
| --pattern "${dll_unsigned}" \ | ||
| --dir "${tmp_dir}" | ||
| if is_signed "${tmp_dir}/${dll_unsigned}"; then | ||
| echo "ERROR: ${dll_unsigned} is already signed" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "[2/8 Signing ${dll_unsigned}..." | ||
| echo "NOTE: Running jsign. You may be prompted for your OTP PIN..." | ||
| jsign --storetype ESIGNER \ | ||
| --alias d97c5110-c66a-4c0c-ac0c-1cd6af812ee6 \ | ||
| --storepass "${ESIGNER_STOREPASS}" \ | ||
| --keypass "${ESIGNER_KEYPASS}" \ | ||
| --tsaurl="http://ts.ssl.com" \ | ||
| --tsmode RFC3161 \ | ||
| --alg SHA256 \ | ||
| "${tmp_dir}/${dll_unsigned}" | ||
| mv "${tmp_dir}/${dll_unsigned}" "${tmp_dir}/${dll_signed}" | ||
| if ! is_signed "${tmp_dir}/${dll_signed}"; then | ||
| echo "ERROR: ${dll_signed} is not signed" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "[3/8 Uploading signed DLL to GitHub Release..." | ||
| gh release upload "${tag}" \ | ||
| --repo "${GITHUB_REPOSITORY}" \ | ||
| --clobber \ | ||
| "${tmp_dir}/${dll_signed}" | ||
| fi | ||
|
|
||
| if [ "${PHASE_BUILD_MSI}" -gt 0 ]; then | ||
| echo "[4/8 Triggering odbc_release_step in cpp_extra.yml workflow..." | ||
| gh workflow run cpp_extra.yml \ | ||
| --repo "${GITHUB_REPOSITORY}" \ | ||
| --ref "${tag}" \ | ||
| --field odbc_release_step=true | ||
|
|
||
| echo "[5/8 Waiting for workflow to complete. This can take a very long time..." | ||
| REPOSITORY="${GITHUB_REPOSITORY}" \ | ||
| "${SOURCE_DIR}/utils-watch-gh-workflow.sh" "${tag}" cpp_extra.yml | ||
| fi | ||
|
|
||
| if [ "${PHASE_SIGN_MSI}" -gt 0 ]; then | ||
| echo "[6/8 Downloading unsigned MSI..." | ||
| gh release download "${tag}" \ | ||
| --repo "${GITHUB_REPOSITORY}" \ | ||
| --pattern "Apache-Arrow-Flight-SQL-ODBC-${version}-win64.msi" \ | ||
| --dir "${tmp_dir}" | ||
| msi="${tmp_dir}/Apache-Arrow-Flight-SQL-ODBC-${version}-win64.msi" | ||
| if is_signed "${msi}"; then | ||
| echo "ERROR: MSI is already signed" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "[7/8 Signing MSI..." | ||
| echo "NOTE: Running jsign. You may be prompted for your OTP PIN..." | ||
| jsign --storetype ESIGNER \ | ||
| --alias d97c5110-c66a-4c0c-ac0c-1cd6af812ee6 \ | ||
| --storepass "${ESIGNER_STOREPASS}" \ | ||
| --keypass "${ESIGNER_KEYPASS}" \ | ||
| --tsaurl="http://ts.ssl.com" \ | ||
| --tsmode RFC3161 \ | ||
| --alg SHA256 \ | ||
| "${msi}" | ||
| if ! is_signed "${msi}"; then | ||
| echo "ERROR: MSI is not signed" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "[8/8 Uploading signed MSI to GitHub Release..." | ||
| gh release upload "${tag}" \ | ||
| --repo "${GITHUB_REPOSITORY}" \ | ||
| --clobber \ | ||
| "${msi}" | ||
| fi | ||
|
amoeba marked this conversation as resolved.
|
File renamed without changes.
|
amoeba marked this conversation as resolved.
|
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you also add
08-publishgh-release.shif it doesn't have any lint failures?If it has any lint failures, it's out of scope of this PR.
Could you also add
07-flightsqlodbc-upload.shtoarrow/.pre-commit-config.yaml
Lines 365 to 383 in 7190a7c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked 08-publishgh-release.sh locally, and it has one failure. I'll file a separate PR.
I added the script to the shfmt step in fa646fc.