Skip to content
Snippets Groups Projects
Commit 46cbe771 authored by Mark Meredith's avatar Mark Meredith
Browse files

Disable mfix-gitlab remote

parent 9f53ecd1
No related branches found
No related tags found
1 merge request!97Disable mfix-gitlab remote
Pipeline #28809 passed
......@@ -29,8 +29,6 @@ build-img:
script:
- GIT_SHA=$(git rev-parse HEAD)
- conan create . exa/stable -s compiler=${COMPILER} -s compiler.version=${CVERSION} -s compiler.libcxx=${LIBCXX}
- conan remote add ${REPO} ${CI_API_V4_URL}/projects/$CI_PROJECT_ID/packages/conan
- conan upload csg-eb/${GIT_SHA}@exa/stable --all --remote=${REPO}
tags:
- docker
......
......@@ -48,33 +48,25 @@ if(err)
message(WARNING "Failed to retrieve CSG-EB Git commit")
else()
string(STRIP ${CSGEB_SHA} CSGEB_SHA)
message(STATUS "CSG-EB commit: ${CSGEB_SHA}" )
message(STATUS "CSG-EB commit: ${CSGEB_SHA}")
endif()
if (USE_GITLAB_PACKAGE)
conan_cmake_configure(REQUIRES
csg-eb/${CSGEB_SHA}@exa/stable
GENERATORS cmake_find_package)
message(STATUS "Disabling mfix-gitlab remote (if it exists)")
execute_process(
COMMAND ${CONAN_CMD} remote disable mfix-gitlab
)
conan_add_remote(
NAME mfix-gitlab
INDEX 1
URL https://mfix.netl.doe.gov/gitlab/api/v4/projects/232/packages/conan
VERIFY_SSL True
)
else()
execute_process(
COMMAND ${CONAN_CMD} create --build=missing ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND_ERROR_IS_FATAL ANY
)
conan_cmake_configure(REQUIRES
csg-eb/${CSGEB_SHA}
GENERATORS cmake_find_package)
conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_BINARY_DIR}/conanfile.txt
BUILD missing
SETTINGS ${settings})
endif()
execute_process(
COMMAND ${CONAN_CMD} create --build=missing ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND_ERROR_IS_FATAL ANY
)
conan_cmake_configure(REQUIRES
csg-eb/${CSGEB_SHA}
GENERATORS cmake_find_package)
conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_BINARY_DIR}/conanfile.txt
BUILD missing
SETTINGS ${settings})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR})
find_package(csg-eb REQUIRED)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment