Skip to content

Commit 9c5b73e

Browse files
authored
Rollup merge of #67525 - Mark-Simulacrum:fix-toolstate-master, r=Centril
Utilize rust-lang/rust commit hashes in toolstate When moving the script out of CI configuration and into a proper script we lost track of the current directory changing (and as such the parameters of the script needing to be different now).
2 parents ce6f0b0 + a6df38e commit 9c5b73e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/ci/publish_toolstate.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ printf 'https://%s:x-oauth-basic@github.com\n' "$TOOLSTATE_REPO_ACCESS_TOKEN" \
1414
> "$HOME/.git-credentials"
1515
git clone --depth=1 $TOOLSTATE_REPO
1616

17+
GIT_COMMIT="$(git rev-parse HEAD)"
18+
GIT_COMMIT_MSG="$(git log --format=%s -n1 HEAD)"
19+
1720
cd rust-toolstate
1821
FAILURE=1
1922
for RETRY_COUNT in 1 2 3 4 5; do
2023
# The purpose is to publish the new "current" toolstate in the toolstate repo.
21-
"$BUILD_SOURCESDIRECTORY/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" \
22-
"$(git log --format=%s -n1 HEAD)" \
24+
"$BUILD_SOURCESDIRECTORY/src/tools/publish_toolstate.py" "$GIT_COMMIT" \
25+
"$GIT_COMMIT_MSG" \
2326
"$MESSAGE_FILE" \
2427
"$TOOLSTATE_REPO_ACCESS_TOKEN"
2528
# `git commit` failing means nothing to commit.

0 commit comments

Comments
 (0)