File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed
Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -86,4 +86,4 @@ echo "$NEW_GYP" >"$DEPS_DIR/googletest/googletest.gyp"
8686# Update the version number on maintaining-dependencies.md
8787# and print the new version as the last line of the script as we need
8888# to add it to $GITHUB_ENV variable
89- finalize_version_update "googletest" "$NEW_VERSION "
89+ finalize_version_update "googletest" "$NEW_UPSTREAM_SHA1 "
Original file line number Diff line number Diff line change @@ -8,16 +8,15 @@ NIXPKGS_PIN_FILE="$BASE_DIR/tools/nix/pkgs.nix"
88
99NIXPKGS_REPO=$(grep 'repo =' "$NIXPKGS_PIN_FILE" | awk -F'"' '{ print $2 }')
1010CURRENT_VERSION_SHA1=$(grep 'rev =' "$NIXPKGS_PIN_FILE" | awk -F'"' '{ print $2 }')
11- CURRENT_VERSION=$(echo "$CURRENT_VERSION_SHA1" | head -c 7)
1211
1312NEW_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 )
1514
1615
1716# shellcheck disable=SC1091
1817. "$BASE_DIR/tools/dep_updaters/utils.sh"
1918
20- compare_dependency_version "nixpkgs-unstable" "$NEW_VERSION " "$CURRENT_VERSION "
19+ compare_dependency_version "nixpkgs-unstable" "$CURRENT_VERSION_SHA1 " "$NEW_UPSTREAM_SHA1 "
2120
2221CURRENT_TARBALL_HASH=$(grep 'sha256 =' "$NIXPKGS_PIN_FILE" | awk -F'"' '{ print $2 }')
2322NEW_TARBALL_HASH=$(nix-prefetch-url --unpack "$NIXPKGS_REPO/archive/$NEW_UPSTREAM_SHA1.tar.gz")
You can’t perform that action at this time.
0 commit comments