Merge pull request #61 from USEPA/triplet_build

Triplet build Fix Artifact Upload
USEPA · Oct 23, 2023 · 2b3c2e9 · 2b3c2e9
2 parents 89110d7 + c752b67
commit 2b3c2e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -45,5 +45,5 @@ jobs:
       with:
         name: build-test-artifacts
         path: |
-          build/*.zip
-          build/*.tar.gz
+          SRC_engines/build/*.zip
+          SRC_engines/build/*.tar.gz
diff --git a/SRC_engines/CMakeLists.txt b/SRC_engines/CMakeLists.txt
@@ -16,7 +16,6 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 # Sets the position independent code property for all targets
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-
 # Sets default install prefix when cmakecache is initialized for first time
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "..." FORCE)
@@ -31,7 +30,7 @@ set(CONFIG_DIST  "cmake")
 # option(BUILD_TESTS "Build component tests (requires Boost)" OFF)
 option(BUILD_DEF   "Builds library with def file interface" OFF)
 
-# Added option to statically link libraries to address GitHub Ubuntu 20.04 symbol errors (issue #340)
+# Added option to statically link libraries to address GitHub
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 
 add_subdirectory(src/solver)

diff --git a/SRC_engines/src/solver/version.h b/SRC_engines/src/solver/version.h
@@ -22,12 +22,12 @@
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       2
 #define VERSION_PATCH       0
-#define GIT_HASH            "1dd87ecdf7ea48729610355f7d087da064112ca5"
+#define GIT_HASH            "31eb962b1f7c65ac739899105d27617c2a94b7f3"
 
 #define PLATFORM            "Windows"
 #define COMPILER            "MSVC"
-#define COMPILER_VERSION    "19.37.32822.0"
-#define BUILD_ID            "2023-09-12T18:19:20Z"
+#define COMPILER_VERSION    "19.37.32824.0"
+#define BUILD_ID            "2023-10-23T18:30:13Z"
 
 
 static inline int get_version_legacy() { \