[upstream_utils] Remove ConcurrentQueue (#7183)

It appears to be broken under stress testing (dropped/duplicate values). This reverts commit 97c6c86 (#7066).
wpilibsuite · Oct 11, 2024 · dcf5f55 · dcf5f55
1 parent f65f9ed
commit dcf5f55
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 3,815 deletions.
diff --git a/.github/workflows/upstream-utils.yml b/.github/workflows/upstream-utils.yml
@@ -40,11 +40,6 @@ jobs:
           cd upstream_utils
           ./argparse_lib.py clone
           ./argparse_lib.py copy-src
-      - name: Run concurrentqueue.py
-        run: |
-          cd upstream_utils
-          ./concurrentqueue.py clone
-          ./concurrentqueue.py copy-src
       - name: Run eigen.py
         run: |
           cd upstream_utils

diff --git a/upstream_utils/concurrentqueue.py b/upstream_utils/concurrentqueue.py
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
@@ -195,7 +195,6 @@ install(
     DIRECTORY
         src/main/native/include/
         src/main/native/thirdparty/argparse/include/
-        src/main/native/thirdparty/concurrentqueue/include/
         src/main/native/thirdparty/expected/include/
         src/main/native/thirdparty/json/include/
         src/main/native/thirdparty/llvm/include/
@@ -209,7 +208,6 @@ target_include_directories(
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/argparse/include>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/concurrentqueue/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/expected/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/json/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/llvm/include>

diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle
@@ -183,9 +183,6 @@ cppHeadersZip {
     from('src/main/native/thirdparty/argparse/include/') {
         into '/'
     }
-    from('src/main/native/thirdparty/concurrentqueue/include') {
-        into '/'
-    }
     from('src/main/native/thirdparty/expected/include') {
         into '/'
     }
@@ -241,7 +238,7 @@ model {
         all {
             it.sources.each {
                 it.exportedHeaders {
-                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/argparse/include/', 'src/main/native/thirdparty/concurrentqueue/include', 'src/main/native/thirdparty/expected/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include', 'src/main/native/thirdparty/protobuf/include'
+                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/argparse/include/', 'src/main/native/thirdparty/expected/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include', 'src/main/native/thirdparty/protobuf/include'
                 }
             }
         }