Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
csg-eb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
exa
csg-eb
Commits
46cbe771
Commit
46cbe771
authored
3 years ago
by
Mark Meredith
Browse files
Options
Downloads
Patches
Plain Diff
Disable mfix-gitlab remote
parent
9f53ecd1
No related branches found
Branches containing commit
No related tags found
1 merge request
!97
Disable mfix-gitlab remote
Pipeline
#28809
passed
3 years ago
Stage: build-img
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+0
-2
0 additions, 2 deletions
.gitlab-ci.yml
CMakeLists.txt
+16
-24
16 additions, 24 deletions
CMakeLists.txt
with
16 additions
and
26 deletions
.gitlab-ci.yml
+
0
−
2
View file @
46cbe771
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
16
−
24
View file @
46cbe771
...
...
@@ -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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment