From a4b0bd9ee0259bac964cd8f0bb8ad91be691b0d8 Mon Sep 17 00:00:00 2001
From: Peter Dillinger <peterd@meta.com>
Date: Fri, 15 Dec 2023 12:07:42 -0800
Subject: [PATCH] Fix timeout syntax, disable circleci on push

---
 .circleci/config.yml                          | 52 -------------------
 .github/actions/post-steps/action.yml         |  2 +-
 .../workflows/jobs-linux-run-tests-san.yml    |  2 +-
 3 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 370ad301a8d..2206f1f1b8b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -879,58 +879,6 @@ jobs:
 
 workflows:
   version: 2
-  jobs-linux-run-tests:
-    jobs:
-      - build-linux
-      - build-linux-cmake-with-folly
-      - build-linux-cmake-with-folly-lite-no-test
-      - build-linux-gcc-7-with-folly
-      - build-linux-gcc-7-with-folly-lite-no-test
-      - build-linux-cmake-with-folly-coroutines
-      - build-linux-cmake-with-benchmark
-      - build-linux-encrypted_env-no_compression
-  jobs-linux-run-tests-san:
-    jobs:
-      - build-linux-clang10-asan
-      - build-linux-clang10-ubsan
-      - build-linux-clang10-mini-tsan
-      - build-linux-static_lib-alt_namespace-status_checked
-  jobs-linux-no-test-run:
-    jobs:
-      - build-linux-release
-      - build-linux-release-rtti
-      - build-examples
-      - build-fuzzers
-      - build-linux-clang-no_test_run
-      - build-linux-clang-13-no_test_run
-      - build-linux-gcc-8-no_test_run
-      - build-linux-gcc-10-cxx20-no_test_run
-      - build-linux-gcc-11-no_test_run
-      - build-linux-arm-cmake-no_test_run
-  jobs-linux-other-checks:
-    jobs:
-      - build-linux-clang10-clang-analyze
-      - build-linux-unity-and-headers
-      - build-linux-mini-crashtest
-  jobs-windows:
-    jobs:
-      - build-windows-vs2019
-      - build-cmake-mingw
-  jobs-java:
-    jobs:
-      - build-linux-java
-      - build-linux-java-static
-      - build-macos-java
-      - build-macos-java-static
-      - build-macos-java-static-universal
-      - build-linux-java-pmd
-  jobs-macos:
-    jobs:
-      - build-macos
-      - build-macos-cmake:
-          run_even_tests: true
-      - build-macos-cmake:
-          run_even_tests: false
   jobs-linux-arm:
     jobs:
       - build-linux-arm
diff --git a/.github/actions/post-steps/action.yml b/.github/actions/post-steps/action.yml
index a7a9f2faff4..17535e4a73d 100644
--- a/.github/actions/post-steps/action.yml
+++ b/.github/actions/post-steps/action.yml
@@ -6,7 +6,7 @@ runs:
   - name: Setup tmate session #TEMPORARY!
     if: ${{ failure() }}
     uses: mxschmitt/action-tmate@v3
-    timeout: 60
+    timeout-minutes: 60
     with:
       limit-access-to-actor: true
   - uses: actions/upload-artifact@v3.1.3
diff --git a/.github/workflows/jobs-linux-run-tests-san.yml b/.github/workflows/jobs-linux-run-tests-san.yml
index 7fd68ff3805..0217cebb890 100644
--- a/.github/workflows/jobs-linux-run-tests-san.yml
+++ b/.github/workflows/jobs-linux-run-tests-san.yml
@@ -11,7 +11,7 @@ jobs:
     - uses: "./.github/actions/pre-steps"
     - name: Setup tmate session #TEMPORARY!
       uses: mxschmitt/action-tmate@v3
-      timeout: 20
+      timeout-minutes: 20
       with:
         limit-access-to-actor: true
     - run: COMPILE_WITH_ASAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check