Skip to content

Commit

Permalink
chore: Allow skipping key verification on centos7 (#240)
Browse files Browse the repository at this point in the history
...because something about the gpg version on centos7 is too old (
https://github.com/apache/arrow-nanoarrow/actions/runs/5293770871/jobs/9582325801#step:4:337
).
  • Loading branch information
paleolimbot authored Jun 19, 2023
1 parent a682731 commit 4c5b247
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,11 @@ jobs:
- {platform: "fedora", arch: "amd64"}
- {platform: "archlinux", arch: "amd64"}
- {platform: "alpine", arch: "amd64"}
- {platform: "centos7", arch: "amd64"}
- {
platform: "centos7",
arch: "amd64",
compose_args: "-e NANOARROW_ACCEPT_IMPORT_GPG_KEYS_ERROR=1"
}
- {
platform: "ubuntu",
arch: "amd64",
Expand Down
5 changes: 5 additions & 0 deletions dev/release/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,11 @@ curl -L https://github.com/apache/arrow/archive/refs/tags/apache-arrow-9.0.0.tar
export NANOARROW_CMAKE_OPTIONS="-DArrow_DIR=$(pwd)/arrow/lib/cmake/Arrow"
export CMAKE_BIN=cmake3
export CTEST_BIN=ctest3

# gpg on centos7 errors for some keys in the Arrow KEYS file. This does
# not skip verifying signatures, just allows errors for unsupported entries in
# the global Arrow KEYS file.
export NANOARROW_ACCEPT_IMPORT_GPG_KEYS_ERROR=1
```

### Big endian
Expand Down
11 changes: 10 additions & 1 deletion dev/release/verify-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
# If unset, the script will check out a version into NANOARROW_TMPDIR.
# - NANOARROW_TMPDIR: Use to specify a persistent directory such that verification
# results are more easily retrieved.
# - NANOARROW_ACCEPT_IMPORT_GPG_KEYS_ERROR: Don't stop verification even when
# "gpg --import KEYS" returns an error. In general, we should not use this
# to ensure importing all GPG keys. But newer algorithms such as ed25519 may
# not be supported in old GPG such as GPG on CentOS 7.
# - TEST_SOURCE: Set to 0 to selectively run component verification.
# - TEST_C: Builds C libraries and tests using the default CMake
# configuration. Defaults to the value of TEST_SOURCE.
Expand Down Expand Up @@ -114,7 +118,12 @@ import_gpg_keys() {
return 0
fi
download_dist_file KEYS
gpg --import KEYS

if [ "${NANOARROW_ACCEPT_IMPORT_GPG_KEYS_ERROR:-0}" -gt 0 ]; then
gpg --import KEYS || true
else
gpg --import KEYS
fi

GPGKEYS_ALREADY_IMPORTED=1
}
Expand Down

0 comments on commit 4c5b247

Please sign in to comment.