Commit 7d7ea1d
committed
tools: update c-ares updater script
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #64194
Reviewed-By: Richard Lau <richard.lau@ibm.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>1 parent 5396235 commit 7d7ea1d
2 files changed
Lines changed: 17 additions & 16 deletions
Binary file not shown.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | #!/bin/sh | |
| 2 | - set -e | ||
| 2 | + set -ex | ||
| 3 | 3 | # Shell script to update c-ares in the source tree to a specific version | |
| 4 | 4 | ||
| 5 | 5 | BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd) | |
@@ -22,11 +22,11 @@ if (!res.ok) throw new Error(`FetchError: ${res.status} ${res.statusText}`, { ca | |||
| 22 | 22 | const { tag_name, assets } = await res.json(); | |
| 23 | 23 | const { browser_download_url, name } = assets.find(({ name }) => name.endsWith('.tar.gz')); | |
| 24 | 24 | if(!browser_download_url || !name) throw new Error('No tarball found'); | |
| 25 | - console.log(`${tag_name} ${browser_download_url} ${name}`); | ||
| 25 | + console.log(`${tag_name.replace(/^v/, '')} ${browser_download_url}`); | ||
| 26 | 26 | EOF | |
| 27 | 27 | )" | |
| 28 | 28 | ||
| 29 | - IFS=' ' read -r NEW_VERSION NEW_VERSION_URL ARES_TARBALL <<EOF | ||
| 29 | + IFS=' ' read -r NEW_VERSION NEW_VERSION_URL <<EOF | ||
| 30 | 30 | $NEW_VERSION_METADATA | |
| 31 | 31 | EOF | |
| 32 | 32 | ||
@@ -38,6 +38,7 @@ compare_dependency_version "c-ares" "$NEW_VERSION" "$CURRENT_VERSION" | |||
| 38 | 38 | echo "Making temporary workspace" | |
| 39 | 39 | ||
| 40 | 40 | WORKSPACE=$(mktemp -d 2> /dev/null || mktemp -d -t 'tmp') | |
| 41 | + ARES_TARBALL="$WORKSPACE/c-ares.tgz" | ||
| 41 | 42 | ||
| 42 | 43 | cleanup () { | |
| 43 | 44 | EXIT_CODE=$? | |
@@ -47,29 +48,29 @@ cleanup () { | |||
| 47 | 48 | ||
| 48 | 49 | trap cleanup INT TERM EXIT | |
| 49 | 50 | ||
| 50 | - cd "$WORKSPACE" | ||
| 51 | - | ||
| 52 | 51 | echo "Fetching c-ares source archive" | |
| 53 | 52 | curl -sL -o "$ARES_TARBALL" "$NEW_VERSION_URL" | |
| 54 | - log_and_verify_sha256sum "c-ares" "$ARES_TARBALL" | ||
| 55 | - gzip -dc "$ARES_TARBALL" | tar xf - | ||
| 56 | - rm -- "$ARES_TARBALL" | ||
| 57 | 53 | ||
| 58 | - FOLDER=$(ls -d -- */) | ||
| 54 | + echo "Verifying PGP signature" | ||
| 55 | + curl -sL -o "$ARES_TARBALL.asc" "$NEW_VERSION_URL.asc" | ||
| 56 | + gpgv --keyring "$BASE_DIR/tools/dep_updaters/c-ares.kbx" "${ARES_TARBALL}.asc" "${ARES_TARBALL}" | ||
| 57 | + | ||
| 58 | + log_and_verify_sha256sum "c-ares" "$ARES_TARBALL" | ||
| 59 | + tar -C "$WORKSPACE" -xzf "$ARES_TARBALL" | ||
| 59 | 60 | ||
| 60 | - mv -- "$FOLDER" cares | ||
| 61 | + ARES_FOLDER=$(find "$WORKSPACE" -mindepth 1 -maxdepth 1 -type d -print -quit) | ||
| 61 | 62 | ||
| 62 | 63 | echo "Removing tests" | |
| 63 | - rm -rf "$WORKSPACE/cares/test" | ||
| 64 | + rm -rf "$ARES_FOLDER/test" | ||
| 64 | 65 | ||
| 65 | 66 | echo "Copying existing .gitignore, config, gyp and gn files" | |
| 66 | - cp -R "$DEPS_DIR/cares/config" "$WORKSPACE/cares" | ||
| 67 | - cp "$DEPS_DIR/cares/.gitignore" "$WORKSPACE/cares" | ||
| 68 | - cp "$DEPS_DIR/cares/cares.gyp" "$WORKSPACE/cares" | ||
| 69 | - cp "$DEPS_DIR/cares/"*.gn "$DEPS_DIR/cares/"*.gni "$WORKSPACE/cares" | ||
| 67 | + cp -R "$DEPS_DIR/cares/config" "$ARES_FOLDER" | ||
| 68 | + cp "$DEPS_DIR/cares/.gitignore" "$ARES_FOLDER" | ||
| 69 | + cp "$DEPS_DIR/cares/cares.gyp" "$ARES_FOLDER" | ||
| 70 | + cp "$DEPS_DIR/cares/"*.gn "$DEPS_DIR/cares/"*.gni "$ARES_FOLDER" | ||
| 70 | 71 | ||
| 71 | 72 | echo "Replacing existing c-ares" | |
| 72 | - replace_dir "$DEPS_DIR/cares" "$WORKSPACE/cares" | ||
| 73 | + replace_dir "$DEPS_DIR/cares" "$ARES_FOLDER" | ||
| 73 | 74 | ||
| 74 | 75 | echo "Updating cares.gyp" | |
| 75 | 76 | "$NODE" "$ROOT/tools/dep_updaters/update-c-ares.mjs" | |
0 commit comments