Merge branch 'master' into ISSUE_639

3drepo · Sep 4, 2023 · 3ad1f45 · 3ad1f45
2 parents 8cd386e + 959cfba
commit 3ad1f45
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -50,7 +50,7 @@ matrix:
           - tar -zxf testData/bouncer/ext_libs/focal/assimp.tgz
           - export ASSIMP_ROOT=$PWD/assimp
           - echo ============ IFCOPENSHELL INSTALL =============
-          - tar -zxf testData/bouncer/ext_libs/focal/IfcOpenShell_v0.6.0/OCCT.tgz
+          - tar -zxf testData/bouncer/ext_libs/focal/IfcOpenShell_v0.6.0/OCCT_3drepoFix.tgz
           - tar -zxf testData/bouncer/ext_libs/focal/IfcOpenShell_v0.6.0/IfcOpenShell.tgz
           - sudo apt-get install tk-dev tcl-dev libxmu-dev libxi-dev
           - export OCCT_ROOT=$PWD/OCCT

diff --git a/bouncer/CMakeLists.txt b/bouncer/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_subdirectory(src)
 
 set(VERSION_MAJOR 5)
-set(VERSION_MINOR 3_0)
+set(VERSION_MINOR 4_0)
 
 include_directories(${Boost_INCLUDE_DIRS} ${MONGO_INCLUDE_DIR} ${ASSIMP_INCLUDE_DIR} ${OCCT_INCLUDE_DIR} ${IFCOPENSHELL_INCLUDE_DIR} ${ODA_INCLUDE_DIR} ${SYNCHRO_READER_INCLUDE_DIR} ${AWSSDK_INCLUDE_DIR} ${CRYPTOLENS_INCLUDE_DIR} src ../)
 add_definitions(-DREPO_API_LIBRARY)

diff --git a/bouncer/src/repo/repo_bouncer_global.h b/bouncer/src/repo/repo_bouncer_global.h
@@ -35,7 +35,7 @@
 //------------------------------------------------------------------------------
 #define BOUNCER_VMAJOR 5
 
-#define BOUNCER_VMINOR "3_0"
+#define BOUNCER_VMINOR "4_0"
 #define REPO_MAX_OBJ_SIZE (16 * 1024 * 1024)
 
 //
diff --git a/test/src/system/st_3drepobouncerClient.cpp b/test/src/system/st_3drepobouncerClient.cpp
@@ -307,6 +307,11 @@ TEST(RepoClientTest, UploadTestIFC)
 	EXPECT_EQ((int)REPOERR_OK, runProcess(ifcUpload));
 	EXPECT_TRUE(projectExists(db, "ifcTest"));
 
+	//Upload IFCFile
+	std::string ifcUploadReg = produceUploadArgs(db, "ifcTestRegression", getDataPath(ifcModel_InfiniteLoop));
+	EXPECT_EQ((int)REPOERR_OK, runProcess(ifcUploadReg));
+	EXPECT_TRUE(projectExists(db, "ifcTestRegression"));
+
 	std::string ifc4Upload = produceUploadArgs(db, "ifc4Test", getDataPath(ifc4Model));
 	EXPECT_EQ((int)REPOERR_OK, runProcess(ifc4Upload));
 	EXPECT_TRUE(projectExists(db, "ifc4Test"));

diff --git a/test/src/unit/repo_test_database_info.h b/test/src/unit/repo_test_database_info.h
@@ -47,6 +47,7 @@ const static std::string missingNodesModel = "Wall.ifc";
 const static std::string texturedModel2 = "texturedPlane2.dae"; //With Texture
 const static std::string badExtensionFile = "cube.exe";
 const static std::string ifcModel = "duplex.ifc";
+const static std::string ifcModel_InfiniteLoop = "infiniteLoop.ifc";
 const static std::string ifc4Model = "ifc4Test.ifc";
 const static std::string dgnModel = "sample.dgn";
 const static std::string dwgModel = "box.dwg";

diff --git a/tools/bouncer_worker/package.json b/tools/bouncer_worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "3drepobouncerWorker",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "engines": {
     "node": "18.x.x"
   },