diff --git a/.github/workflows/sanity_check.yml b/.github/workflows/sanity_check.yml index efc9d99cf37..0a23fd8bd28 100644 --- a/.github/workflows/sanity_check.yml +++ b/.github/workflows/sanity_check.yml @@ -15,7 +15,7 @@ jobs: - name: Fetch from upstream run: | - git remote add upstream https://github.com/facebook/rocksdb.git && git fetch upstream + git remote add upstream https://github.com/tikv/rocksdb.git && git fetch upstream - name: Where am I run: | @@ -37,6 +37,8 @@ jobs: - name: Check format run: VERBOSE_CHECK=1 make check-format + env: + FORMAT_UPSTREAM: upstream/8.10.tikv - name: Compare buckify output run: make check-buck-targets diff --git a/db/db_test.cc b/db/db_test.cc index 99a03b1509a..b88f772c48f 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -2681,7 +2681,15 @@ TEST_F(DBTest, GetLiveBlobFiles) { ASSERT_EQ(cfmd.blob_file_size, bmd.blob_file_size); } -TEST_F(DBTest, PurgeInfoLogs) { +// Disable this test, since it fails with current tikv/rocksdb CI setup. +// This test fails if it run as ./db_test, since previous test cases create +// a dir under dbname causing the assertion in line 2722 to fail. It passes +// when run as `make check -j x`, since test case is executed in separate +// directory. +// TiKV CI cannot migrate to `make check -j x` because the sub-steps require +// python3, which is not available in TiKV CI centos7. +// TODO: Fix this test by using `make check -j x` when TiKV CI has python3 +TEST_F(DBTest, DISABLED_PurgeInfoLogs) { Options options = CurrentOptions(); options.keep_log_file_num = 5; options.create_if_missing = true;