Skip to content

Commit 5c21b7f

Browse files
committed
Do not store CIRCLE_SHA1 in commit_hash.txt
- It is not necessary, because when missing, our CMake config will fetch it from git.
1 parent 15964ca commit 5c21b7f

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

.circleci/config.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,16 @@ commands:
182182
# --------------------------------------------------------------------------
183183
# Build Commands
184184

185-
setup_prerelease_commit_hash:
185+
setup_prerelease:
186186
steps:
187187
- run:
188-
name: Store commit hash and prerelease
188+
name: Store prerelease suffix
189189
command: |
190190
if [[ -n $CIRCLE_TAG ]]; then
191191
echo -n > prerelease.txt;
192192
else
193193
date -u +"nightly.%Y.%-m.%-d" > prerelease.txt;
194194
fi
195-
echo -n "$CIRCLE_SHA1" > commit_hash.txt
196195
197196
install_and_check_minimum_requirements:
198197
parameters:
@@ -1115,7 +1114,7 @@ jobs:
11151114
<<: *base_ubuntu_clang_large
11161115
steps:
11171116
- checkout
1118-
- setup_prerelease_commit_hash
1117+
- setup_prerelease
11191118
- run_build_ossfuzz
11201119
- persist_ossfuzz_executables_to_workspace
11211120
- matrix_notify_failure_unless_pr
@@ -1225,7 +1224,7 @@ jobs:
12251224
<<: *base_ubuntu2404_small
12261225
steps:
12271226
- checkout
1228-
- setup_prerelease_commit_hash
1227+
- setup_prerelease
12291228
- run:
12301229
name: Install build system dependencies
12311230
command: |

scripts/ci/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ else
1818
TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd" > prerelease.txt
1919
fi
2020

21-
if [[ -n $CIRCLE_SHA1 ]]; then
22-
echo -n "$CIRCLE_SHA1" > commit_hash.txt
23-
fi
24-
2521
mkdir -p build
2622
cd build
2723

scripts/ci/build_emscripten.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ function build() {
5353
# if the CI is triggered just before midnight.
5454
TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd" > prerelease.txt
5555
fi
56-
if [[ -n $CIRCLE_SHA1 ]]; then
57-
echo -n "$CIRCLE_SHA1" > commit_hash.txt
58-
fi
5956

6057
# Disable warnings for unqualified `move()` calls, introduced and enabled by
6158
# default in clang-16 which is what the emscripten docker image uses.

0 commit comments

Comments
 (0)