Commit 46cbe771 authored by Mark Meredith's avatar Mark Meredith
Browse files

Disable mfix-gitlab remote

parent 9f53ecd1

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -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

CMakeLists.txt

+16 −24
Original line number Diff line number Diff line
@@ -51,18 +51,11 @@ else() 
   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)



   conan_add_remote(

      NAME mfix-gitlab

      INDEX 1

      URL https://mfix.netl.doe.gov/gitlab/api/v4/projects/232/packages/conan

      VERIFY_SSL True

message(STATUS "Disabling mfix-gitlab remote (if it exists)")

execute_process(

   COMMAND ${CONAN_CMD} remote disable mfix-gitlab

   )

else()



execute_process(

   COMMAND ${CONAN_CMD} create --build=missing ${CMAKE_CURRENT_SOURCE_DIR}

   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -74,7 +67,6 @@ else() 
conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_BINARY_DIR}/conanfile.txt

   BUILD missing

   SETTINGS ${settings})

endif()



list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR})

find_package(csg-eb REQUIRED)