8000 Bug fix/fix non maintainer mode (#21764) · arangodb/arangodb@2e76ae1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2e76ae1

Browse files
dothebartdothebart
authored
Bug fix/fix non maintainer mode (#21764)
* we need to disable the ProcessEnvironmentFeature here too. * hide it in non-maintainer mode here too * hide the forward declarations * fix building of non-maintainer job * hide the forward declarations * hide the forward declarations * hide the forward declarations
1 parent af0d6ce commit 2e76ae1

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

‎.circleci/generate_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ def add_x64_community_workflow(workflows, tests, args):
575575
def add_x64_enterprise_workflow(workflows, tests, args):
576576
build_config = BuildConfig("x64", True, args.sanitizer, args.nightly)
577577
workflow = add_workflow(workflows, tests, build_config, args)
578-
if args.sanitizer == "" and args.ui in ["off", ""]:
578+
if args.sanitizer == "" and args.ui != "only":
579579
add_build_job(
580580
workflow,
581581
build_config,

‎arangod/RestServer/arangod.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,9 @@ class RocksDBIndexCacheRefillFeature;
143143
class RocksDBOptionFeature;
144144
class RocksDBRecoveryManager;
145145
class VectorIndexFeature;
146+
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
146147
class ProcessEnvironmentFeature;
147-
148+
#endif
148149
namespace transaction {
149150

150151
class ManagerFeature;
@@ -258,7 +259,9 @@ using ArangodFeaturesList = TypeList<
258259
ReplicationTimeoutFeature,
259260
SchedulerFeature,
260261
VectorIndexFeature,
262+
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
261263
ProcessEnvironmentFeature,
264+
#endif
262265
#ifdef USE_V8
263266
ScriptFeature,
264267
#endif

‎client-tools/Shell/arangosh.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,15 @@ using ArangoshFeaturesList = TypeList<
4848
VersionFeature, // VersionFeature must go first
4949
#ifdef USE_ENTERPRISE
5050
EncryptionFeature,
51+
#endif
52+
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
53+
ProcessEnvironmentFeature,
5154
#endif
5255
ShellConsoleFeature, HttpEndpointProvider, ConfigFeature, LoggerFeature,
5356
OptionsCheckFeature, FileSystemFeature, RandomFeature, ShellColorsFeature,
5457
ShutdownFeature, SslFeature, V8ShellFeaturePhase, ShellFeature,
5558
V8PlatformFeature, V8ShellFeature, LanguageFeature, V8SecurityFeature,
56-
ProcessMonitoringFeature, TempFeature, ProcessEnvironmentFeature>;
59+
ProcessMonitoringFeature, TempFeature>;
5760
struct ArangoshFeatures : ArangoshFeaturesList {};
5861
using ArangoshServer = ApplicationServerT<ArangoshFeatures>;
5962
using ArangoshFeature = ApplicationFeatureT<ArangoshServer>;

‎client-tools/Utils/ArangoClient.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ class SslFeature;
4747
class VersionFeature;
4848
class HttpEndpointProvider;
4949
class ArangoGlobalContext;
50+
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
5051
class ProcessEnvironmentFeature;
51-
52+
#endif
5253
using namespace application_features;
5354

5455
template<typename... T>
@@ -59,6 +60,9 @@ using ArangoClientFeaturesList = TypeList<
5960
VersionFeature, // VersionFeature must go first
6061
HttpEndpointProvider, ConfigFeature, FileSystemFeature, LoggerFeature,
6162
OptionsCheckFeature, RandomFeature, ShellColorsFeature, ShutdownFeature,
62-
ProcessEnvironmentFeature, SslFeature, T...>;
63+
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
64+
ProcessEnvironmentFeature,
65+
#endif
66+
SslFeature, T...>;
6367

6468
} // namespace arangodb

‎client-tools/VPack/arangovpack.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ using ArangoVPackFeaturesList =
3636
TypeList<BasicFeaturePhaseClient, GreetingsFeaturePhase, VersionFeature,
3737
ConfigFeature, LoggerFeature, OptionsCheckFeature,
3838
FileSystemFeature, RandomFeature, ShellColorsFeature,
39-
ShutdownFeature, ProcessEnvironmentFeature, VPackFeature>;
39+
ShutdownFeature,
40+
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
41+
ProcessEnvironmentFeature,
42+
#endif
43+
VPackFeature>;
4044
struct ArangoVPackFeatures : ArangoVPackFeaturesList {};
4145
using ArangoVPackServer = ApplicationServerT<ArangoVPackFeatures>;
4246
using ArangoVPackFeature = ApplicationFeatureT<ArangoVPackServer>;

0 commit comments

Comments
 (0)
0