WIP: for ci-test

project-tsurugi · Dec 22, 2023 · 44956ce · 44956ce
1 parent 3356883
commit 44956ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -36,14 +36,14 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/.local -DBUILD_PWAL=OFF ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/.local -DBUILD_PWAL=OFF -DENABLE_WAITING_BYPASS=OFF ..
           cmake --build . --target all --clean-first
 
       - name: CMake_Build_with_PWAL
         run: |
           mkdir -p build-pwal
           cd build-pwal
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/.local -DBUILD_PWAL=ON ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/.local -DBUILD_PWAL=ON -DENABLE_WAITING_BYPASS=OFF ..
           cmake --build . --target all --clean-first
 
       - name: CTest

diff --git a/src/concurrency_control/ongoing_tx.cpp b/src/concurrency_control/ongoing_tx.cpp
@@ -200,7 +200,7 @@ bool ongoing_tx::exist_wait_for(session* ti, Status& out_status) {
                          * これは待ち確認のたびにパスを一つ短絡化するため、
                          * get_requested_commit() の確認を噛ませていない。
                          */
-                        bool do_waiting_bypass;
+                        bool do_waiting_bypass;  // NOLINT
 #if WAITING_BYPASS
 # ifdef WAITING_BYPASS_TO_ROOT
                         do_waiting_bypass = true;