foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 09:46:52 -05:00
Code Issues Activity

ci: avoid running git diff after patching

Browse source 
Drop `git diff` command so it is easier to run CI locally if git checkout is a
worktree. Currently it fails because the directory is not recognized as a git
repository.

The `git diff` command was added recently in #28359 commit
fa07ac48d8 and can be avoided just by teeing the
patch to stdout
This commit is contained in:
Ryan Ofsky 2024-02-21 10:02:21 -05:00
parent 46d261631d
commit 84388c942c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ci/test/03_test_script.sh
View file

@ -36,8 +36,8 @@ export HOST=${HOST:-$("$BASE_ROOT_DIR/depends/config.guess")}
# CI, so as a temporary minimal fix to work around UB and CI failures, leave # CI, so as a temporary minimal fix to work around UB and CI failures, leave
# bytes_written unmodified. # bytes_written unmodified.
# See https://github.com/bitcoin/bitcoin/pull/28359#issuecomment-1698694748 # See https://github.com/bitcoin/bitcoin/pull/28359#issuecomment-1698694748
echo 'diff --git a/src/leveldb/db/db_impl.cc b/src/leveldb/db/db_impl.cc # Tee patch to stdout to make it clear CI is testing modified code.
index 65e31724bc..f61b471953 100644 tee >(patch -p1) <<'EOF'
--- a/src/leveldb/db/db_impl.cc --- a/src/leveldb/db/db_impl.cc
+++ b/src/leveldb/db/db_impl.cc +++ b/src/leveldb/db/db_impl.cc
@@ -1028,9 +1028,6 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) { @@ -1028,9 +1028,6 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) {
@ -49,8 +49,8 @@ index 65e31724bc..f61b471953 100644
- } - }
mutex_.Lock(); mutex_.Lock();
stats_[compact->compaction->level() + 1].Add(stats);' | patch -p1 stats_[compact->compaction->level() + 1].Add(stats);
git diff EOF
) )
if [ "$RUN_FUZZ_TESTS" = "true" ]; then if [ "$RUN_FUZZ_TESTS" = "true" ]; then