Skip to content

Commit

Permalink
Merge branch 'master' into branch1
Browse files Browse the repository at this point in the history
  • Loading branch information
Wangch29 authored Dec 18, 2024
2 parents 7bdee1f + 5705473 commit 05fe7a5
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 15 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ jobs:
format: "/usr/bin/clang-format-14",
tidy: "/usr/bin/clang-tidy-14",
}
- {
name: "macOS 12 (Monterey) AppleClang",
os: macos-12,
format: "/usr/local/opt/llvm@14/bin/clang-format",
tidy: "/usr/local/opt/llvm@14/bin/clang-tidy",
}
- {
name: "macOS 13 (Ventura) AppleClang",
os: macos-13,
Expand Down
3 changes: 1 addition & 2 deletions build_support/packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
##
## Supported environments:
## * Ubuntu 22.04 (x86-64)
## * macOS 11 Big Sur (x86-64 or ARM)
## * macOS 12 Monterey (x86-64 or ARM)
## * macOS 13 Ventura (x86-64 or ARM)
## =================================================================

main() {
Expand Down
3 changes: 2 additions & 1 deletion test/txn/txn_index_concurrent_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ TEST(TxnIndexTest, DISABLED_IndexConcurrentUpdateTest) { // NOLINT
if (add_delete_insert) {
StringVectorWriter data_writer;
BUSTUB_ENSURE(bustub->ExecuteSqlTxn(generate_select_sql(i), data_writer, txn), "cannot retrieve data");
BUSTUB_ENSURE(data_writer.values_.size() == 1, "more than 1 row fetched??");
BUSTUB_ENSURE(!data_writer.values_.empty(), "no row fetched??");
BUSTUB_ENSURE(data_writer.values_.size() == 1, "more than one row fetched??");
const auto b_val = std::stoi(data_writer.values_[0][0]);
BUSTUB_ENSURE(bustub->ExecuteSqlTxn(generate_delete_sql(i), data_writer, txn), "cannot delete data");
BUSTUB_ENSURE(bustub->ExecuteSqlTxn(generate_txn_insert_sql(b_val, i), data_writer, txn),
Expand Down
6 changes: 0 additions & 6 deletions third_party/argparse/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:

toolchain:
- macos-latest-clang
- macos-12-clang
- ubuntu-latest-clang
- ubuntu-latest-gcc
- windows-2019-msvc
Expand All @@ -29,11 +28,6 @@ jobs:
c_compiler: clang
cxx_compiler: clang++

- toolchain: macos-12-clang
os: macos-latest
c_compiler: clang
cxx_compiler: clang++

- toolchain: ubuntu-latest-clang
os: ubuntu-latest
c_compiler: clang
Expand Down

0 comments on commit 05fe7a5

Please sign in to comment.