Skip to content

Commit dcf5f55

Browse files
authored
[upstream_utils] Remove ConcurrentQueue (#7183)
It appears to be broken under stress testing (dropped/duplicate values). This reverts commit 97c6c86 (#7066).
1 parent f65f9ed commit dcf5f55

File tree

6 files changed

+1
-3815
lines changed

6 files changed

+1
-3815
lines changed

.github/workflows/upstream-utils.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ jobs:
4040
cd upstream_utils
4141
./argparse_lib.py clone
4242
./argparse_lib.py copy-src
43-
- name: Run concurrentqueue.py
44-
run: |
45-
cd upstream_utils
46-
./concurrentqueue.py clone
47-
./concurrentqueue.py copy-src
4843
- name: Run eigen.py
4944
run: |
5045
cd upstream_utils

upstream_utils/concurrentqueue.py

Lines changed: 0 additions & 40 deletions
This file was deleted.

wpiutil/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ install(
195195
DIRECTORY
196196
src/main/native/include/
197197
src/main/native/thirdparty/argparse/include/
198-
src/main/native/thirdparty/concurrentqueue/include/
199198
src/main/native/thirdparty/expected/include/
200199
src/main/native/thirdparty/json/include/
201200
src/main/native/thirdparty/llvm/include/
@@ -209,7 +208,6 @@ target_include_directories(
209208
PUBLIC
210209
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
211210
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/argparse/include>
212-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/concurrentqueue/include>
213211
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/expected/include>
214212
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/json/include>
215213
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/llvm/include>

wpiutil/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ cppHeadersZip {
183183
from('src/main/native/thirdparty/argparse/include/') {
184184
into '/'
185185
}
186-
from('src/main/native/thirdparty/concurrentqueue/include') {
187-
into '/'
188-
}
189186
from('src/main/native/thirdparty/expected/include') {
190187
into '/'
191188
}
@@ -241,7 +238,7 @@ model {
241238
all {
242239
it.sources.each {
243240
it.exportedHeaders {
244-
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'
241+
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'
245242
}
246243
}
247244
}

0 commit comments

Comments
 (0)