From e47dfe6a1ddef97e5e6917ab1c72d0a2d8c52862 Mon Sep 17 00:00:00 2001 From: Sammy Khamis Date: Mon, 22 Jan 2024 10:49:09 -1000 Subject: [PATCH] [ci full] Update NSS to 3.97 --- libs/build-all.sh | 8 ++++---- libs/build-nss-desktop.sh | 4 ++-- taskcluster/kinds/fetch/kind.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/build-all.sh b/libs/build-all.sh index d37a922aa..ec2a09208 100755 --- a/libs/build-all.sh +++ b/libs/build-all.sh @@ -2,10 +2,10 @@ set -euvx -NSS="nss-3.93" -NSS_ARCHIVE="nss-3.93-with-nspr-4.35.tar.gz" -NSS_URL="https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_93_RTM/src/${NSS_ARCHIVE}" -NSS_SHA256="4a5b5df21f8accc65b80d38b6acf8b017a5d03b5f81f0d23295a11575f300183" +NSS="nss-3.97" +NSS_ARCHIVE="nss-3.97-with-nspr-4.35.tar.gz" +NSS_URL="https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_97_RTM/src/${NSS_ARCHIVE}" +NSS_SHA256="a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce" # End of configuration. diff --git a/libs/build-nss-desktop.sh b/libs/build-nss-desktop.sh index 8fc8d95a8..0635c17a6 100755 --- a/libs/build-nss-desktop.sh +++ b/libs/build-nss-desktop.sh @@ -62,8 +62,8 @@ if [[ "${CROSS_COMPILE_TARGET}" =~ "darwin" ]]; then # run-task has already downloaded + extracted the dependency NSS_DIST_DIR="${MOZ_FETCHES_DIR}/dist" else - curl -sfSL --retry 5 --retry-delay 10 -O "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/app-services.cache.level-3.content.v1.nss-artifact.latest/artifacts/public/dist.tar.bz2" - SHA256="15e8cab63a4e0484564231a24d23d8be349217ba6add53b56609c339bb306829" + curl -sfSL --retry 5 --retry-delay 10 -O "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/yFaMDJo8TgSJeZ51Npqxbg/runs/0/artifacts/public/dist.tar.bz2" + SHA256="1f4ba2d130a59f3c95e316d39667fc8a0e9d5db052469091ed17bef18a563066" echo "${SHA256} dist.tar.bz2" | shasum -a 256 -c - || exit 2 tar xvjf dist.tar.bz2 && rm -rf dist.tar.bz2 NSS_DIST_DIR=$(abspath "dist") diff --git a/taskcluster/kinds/fetch/kind.yml b/taskcluster/kinds/fetch/kind.yml index 015c03c47..d4c27562d 100644 --- a/taskcluster/kinds/fetch/kind.yml +++ b/taskcluster/kinds/fetch/kind.yml @@ -37,6 +37,6 @@ tasks: description: fetches the built NSS artifacts from NSS CI fetch: type: static-url - url: https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/bez00P-rQwutueyGXoy5Wg/runs/0/artifacts/public/dist.tar.bz2 - sha256: 9913a33376ef849903ebd5f032106ef420416aef599030d57641786a2c6a02e5 - size: 22735146 + url: https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/yFaMDJo8TgSJeZ51Npqxbg/runs/0/artifacts/public/dist.tar.bz2 + sha256: 1f4ba2d130a59f3c95e316d39667fc8a0e9d5db052469091ed17bef18a563066 + size: 23671514