From f5ca2624a0cfc0b1e33f5ec7efe767b26a00b961 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 Nov 2024 00:38:03 +0100 Subject: [PATCH 1/4] tools: fix nghttp3 updater script --- .github/workflows/tools.yml | 2 +- tools/dep_updaters/update-nghttp3.sh | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 7cd0c496c6ca68..04c46541546ece 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -51,7 +51,7 @@ permissions: jobs: tools-deps-update: - if: github.repository == 'nodejs/node' + if: github.repository == 'nodejs/node' || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest strategy: fail-fast: false # Prevent other jobs from aborting if one fails diff --git a/tools/dep_updaters/update-nghttp3.sh b/tools/dep_updaters/update-nghttp3.sh index 50a17e32f8a291..9e8e708066fb58 100755 --- a/tools/dep_updaters/update-nghttp3.sh +++ b/tools/dep_updaters/update-nghttp3.sh @@ -42,15 +42,16 @@ cleanup () { trap cleanup INT TERM EXIT NGHTTP3_REF="v$NEW_VERSION" -NGHTTP3_ZIP="nghttp3-$NEW_VERSION" +NGHTTP3_ZIP="nghttp3-${NEW_VERSION}" cd "$WORKSPACE" echo "Fetching nghttp3 source archive..." -curl -sL -o "$NGHTTP3_ZIP.zip" "https://github.com/ngtcp2/nghttp3/archive/refs/tags/$NGHTTP3_REF.zip" -log_and_verify_sha256sum "nghttp3" "$NGHTTP3_ZIP.zip" -unzip "$NGHTTP3_ZIP.zip" -rm "$NGHTTP3_ZIP.zip" +curl -sL -o "$NGHTTP3_ZIP.tar.xz" "https://github.com/ngtcp2/nghttp3/releases/download/v${NEW_VERSION}/${NGHTTP3_ZIP}.tar.xz" +SHA256="$(curl -sL "https://github.com/ngtcp2/nghttp3/releases/download/v${NEW_VERSION}/checksums.txt" | grep 'tar.xz$')" +log_and_verify_sha256sum "nghttp3" "$NGHTTP3_ZIP.tar.xz" "$SHA256" +tar -xJf "$NGHTTP3_ZIP.tar.xz" +rm "$NGHTTP3_ZIP.tar.xz" mv "$NGHTTP3_ZIP" nghttp3 cd nghttp3 From 5446fa9233f9dfdb7eea0d74b240a62d75b517d5 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 Nov 2024 00:44:22 +0100 Subject: [PATCH 2/4] fixup! tools: fix nghttp3 updater script --- tools/dep_updaters/update-nghttp3.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/dep_updaters/update-nghttp3.sh b/tools/dep_updaters/update-nghttp3.sh index 9e8e708066fb58..783f206b1cace3 100755 --- a/tools/dep_updaters/update-nghttp3.sh +++ b/tools/dep_updaters/update-nghttp3.sh @@ -47,8 +47,8 @@ NGHTTP3_ZIP="nghttp3-${NEW_VERSION}" cd "$WORKSPACE" echo "Fetching nghttp3 source archive..." -curl -sL -o "$NGHTTP3_ZIP.tar.xz" "https://github.com/ngtcp2/nghttp3/releases/download/v${NEW_VERSION}/${NGHTTP3_ZIP}.tar.xz" -SHA256="$(curl -sL "https://github.com/ngtcp2/nghttp3/releases/download/v${NEW_VERSION}/checksums.txt" | grep 'tar.xz$')" +curl -sL -o "$NGHTTP3_ZIP.tar.xz" "https://github.com/ngtcp2/nghttp3/releases/download/${NGHTTP3_REF}/${NGHTTP3_ZIP}.tar.xz" +SHA256="$(curl -sL "https://github.com/ngtcp2/nghttp3/releases/download/${NGHTTP3_REF}/checksums.txt" | grep 'tar.xz$')" log_and_verify_sha256sum "nghttp3" "$NGHTTP3_ZIP.tar.xz" "$SHA256" tar -xJf "$NGHTTP3_ZIP.tar.xz" rm "$NGHTTP3_ZIP.tar.xz" From a200513dc8394d934091d2695675cd84daae2429 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 Nov 2024 00:45:59 +0100 Subject: [PATCH 3/4] fixup! tools: fix nghttp3 updater script --- .github/workflows/tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 04c46541546ece..7cd0c496c6ca68 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -51,7 +51,7 @@ permissions: jobs: tools-deps-update: - if: github.repository == 'nodejs/node' || github.event_name == 'workflow_dispatch' + if: github.repository == 'nodejs/node' runs-on: ubuntu-latest strategy: fail-fast: false # Prevent other jobs from aborting if one fails From 68bd06c9ddfe37fcfbe6515d4edb836b852c6357 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 Nov 2024 14:48:09 +0100 Subject: [PATCH 4/4] update var name --- tools/dep_updaters/update-nghttp3.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/dep_updaters/update-nghttp3.sh b/tools/dep_updaters/update-nghttp3.sh index 783f206b1cace3..1a4df351b8abba 100755 --- a/tools/dep_updaters/update-nghttp3.sh +++ b/tools/dep_updaters/update-nghttp3.sh @@ -42,17 +42,17 @@ cleanup () { trap cleanup INT TERM EXIT NGHTTP3_REF="v$NEW_VERSION" -NGHTTP3_ZIP="nghttp3-${NEW_VERSION}" +ARCHIVE_BASENAME="nghttp3-${NEW_VERSION}" cd "$WORKSPACE" echo "Fetching nghttp3 source archive..." -curl -sL -o "$NGHTTP3_ZIP.tar.xz" "https://github.com/ngtcp2/nghttp3/releases/download/${NGHTTP3_REF}/${NGHTTP3_ZIP}.tar.xz" +curl -sL -o "$ARCHIVE_BASENAME.tar.xz" "https://github.com/ngtcp2/nghttp3/releases/download/${NGHTTP3_REF}/${ARCHIVE_BASENAME}.tar.xz" SHA256="$(curl -sL "https://github.com/ngtcp2/nghttp3/releases/download/${NGHTTP3_REF}/checksums.txt" | grep 'tar.xz$')" -log_and_verify_sha256sum "nghttp3" "$NGHTTP3_ZIP.tar.xz" "$SHA256" -tar -xJf "$NGHTTP3_ZIP.tar.xz" -rm "$NGHTTP3_ZIP.tar.xz" -mv "$NGHTTP3_ZIP" nghttp3 +log_and_verify_sha256sum "nghttp3" "$ARCHIVE_BASENAME.tar.xz" "$SHA256" +tar -xJf "$ARCHIVE_BASENAME.tar.xz" +rm "$ARCHIVE_BASENAME.tar.xz" +mv "$ARCHIVE_BASENAME" nghttp3 cd nghttp3