Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NPDet
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
Container registry
Model registry
Operate
Environments
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
EIC
NPDet
Commits
b0583603
Commit
b0583603
authored
4 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Plain Diff
Merge branch 'dd4pod' into 'master'
gitlab-ci See merge request
!135
parents
92768593
c97bb5c2
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+10
-0
10 additions, 0 deletions
.gitlab-ci.yml
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
containers/docker/Makefile
+2
-0
2 additions, 0 deletions
containers/docker/Makefile
with
13 additions
and
1 deletion
.gitlab-ci.yml
+
10
−
0
View file @
b0583603
...
...
@@ -20,6 +20,16 @@ docker_image:
only
:
-
master
-
ci_dev
script
:
-
cd containers/docker && make release-latest
docker_tag
:
image
:
eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
stage
:
container
tags
:
-
sodium
only
:
-
tags
script
:
-
cd containers/docker && make release
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
1
View file @
b0583603
cmake_minimum_required
(
VERSION 3.2 FATAL_ERROR
)
project
(
NPDet VERSION 0.
2
.0
project
(
NPDet VERSION 0.
3
.0
LANGUAGES CXX
)
option
(
BUILD_DATA_MODEL
"build the dd4pod datamodel"
ON
)
...
...
This diff is collapsed.
Click to expand it.
containers/docker/Makefile
+
2
−
0
View file @
b0583603
...
...
@@ -75,6 +75,8 @@ login: ## Auto login to AWS-ECR unsing aws-cli
@
docker login
-u
${
CI_REGISTRY_USER
}
-p
${
CI_REGISTRY_PASSWORD
}
${
CI_REGISTRY
}
echo
"Login COMPLETE"
release-latest
:
build login publish-latest
##
Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR
release
:
build-nc publish cleanup
##
Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR
release-cached
:
build publish
##
Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR
...
...
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