From 46cbe771bad57377342e65787280a9430bd9ac9e Mon Sep 17 00:00:00 2001
From: Mark Meredith <mark.meredith@netl.doe.gov>
Date: Thu, 28 Oct 2021 13:19:50 +0000
Subject: [PATCH] Disable mfix-gitlab remote

---
 .gitlab-ci.yml |  2 --
 CMakeLists.txt | 40 ++++++++++++++++------------------------
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c313ca6..b95302c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ee27b4..155340e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
-- 
GitLab