tools: do not use short hashes for deps versioning to avoid collision · nodejs/node@7fc9931 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 632
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 7fc9931

Browse filesBrowse the repository at this point in the historyBrowse files

aduh95

committed

tools: do not use short hashes for deps versioning to avoid collision

PR-URL: #60407 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>

1 parent 76e0d86 commit 7fc9931
Copy full SHA for 7fc9931

2 files changed

+3-4Lines changed: 3 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tools/dep_updaters
  • update-googletest.sh
  • update-nixpkgs-pin.sh

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tools/dep_updaters/update-googletest.sh‎

Copy file name to clipboardExpand all lines: tools/dep_updaters/update-googletest.sh

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -86,4 +86,4 @@ echo "$NEW_GYP" >"$DEPS_DIR/googletest/googletest.gyp"
86	86	# Update the version number on maintaining-dependencies.md
87	87	# and print the new version as the last line of the script as we need
88	88	# to add it to $GITHUB_ENV variable
89		- finalize_version_update "googletest" "$NEW_VERSION"
	89	+ finalize_version_update "googletest" "$NEW_UPSTREAM_SHA1"

Collapse file

‎tools/dep_updaters/update-nixpkgs-pin.sh‎

Copy file name to clipboardExpand all lines: tools/dep_updaters/update-nixpkgs-pin.sh

+2-3Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -8,16 +8,15 @@ NIXPKGS_PIN_FILE="$BASE_DIR/tools/nix/pkgs.nix"
8	8
9	9	NIXPKGS_REPO=$(grep 'repo =' "$NIXPKGS_PIN_FILE" | awk -F'"' '{ print $2 }')
10	10	CURRENT_VERSION_SHA1=$(grep 'rev =' "$NIXPKGS_PIN_FILE" | awk -F'"' '{ print $2 }')
11		- CURRENT_VERSION=$(echo "$CURRENT_VERSION_SHA1" | head -c 7)
12	11
13	12	NEW_UPSTREAM_SHA1=$(git ls-remote "$NIXPKGS_REPO.git" nixpkgs-unstable | awk '{print $1}')
14		- NEW_VERSION=$(echo "$NEW_UPSTREAM_SHA1" | head -c 7)
	13	+ NEW_VERSION=$(echo "$NEW_UPSTREAM_SHA1" | head -c 35)
15	14
16	15
17	16	# shellcheck disable=SC1091
18	17	. "$BASE_DIR/tools/dep_updaters/utils.sh"
19	18
20		- compare_dependency_version "nixpkgs-unstable" "$NEW_VERSION" "$CURRENT_VERSION"
	19	+ compare_dependency_version "nixpkgs-unstable" "$CURRENT_VERSION_SHA1" "$NEW_UPSTREAM_SHA1"
21	20
22	21	CURRENT_TARBALL_HASH=$(grep 'sha256 =' "$NIXPKGS_PIN_FILE" | awk -F'"' '{ print $2 }')
23	22	NEW_TARBALL_HASH=$(nix-prefetch-url --unpack "$NIXPKGS_REPO/archive/$NEW_UPSTREAM_SHA1.tar.gz")

0 commit comments

Comments

0 (0)