Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
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
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Commits
993b812c
Commit
993b812c
authored
4 years ago
by
Andrew Kapuscinski
Browse files
Options
Downloads
Patches
Plain Diff
changed default branch from development to main
parent
93c1f9eb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+4
-4
4 additions, 4 deletions
.gitlab-ci.yml
with
4 additions
and
4 deletions
.gitlab-ci.yml
+
4
−
4
View file @
993b812c
...
...
@@ -57,7 +57,7 @@ build dev workflow:
echo "Building branch: ${CI_COMMIT_BRANCH}"; \
docker build -t marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_BRANCH" -f services/workflow/Dockerfile.dev . ; \
docker tag marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_BRANCH" marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_SHORT_SHA" ; \
if [ "$CI_COMMIT_BRANCH" != "
development
" ]; then \
if [ "$CI_COMMIT_BRANCH" != "
main
" ]; then \
echo "WORKFLOW_BRANCH=$CI_COMMIT_BRANCH" >> build.env; \
fi
fi
...
...
@@ -94,7 +94,7 @@ build dev capability:
echo "Building branch: ${CI_COMMIT_BRANCH}"; \
docker build -t marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_BRANCH" -f services/capability/Dockerfile.dev . ; \
docker tag marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_BRANCH" marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_SHORT_SHA" ; \
if [ "$CI_COMMIT_BRANCH" != "
development
" ]; then \
if [ "$CI_COMMIT_BRANCH" != "
main
" ]; then \
echo "CAPABILITY_BRANCH=$CI_COMMIT_BRANCH" >> build.env; \
fi
fi
...
...
@@ -140,7 +140,7 @@ push dev workflow:
if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "" ]; then \
echo "Pushing PR branch image to registry: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; \
docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ; \
if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "
development
" ]; then \
if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "
main
" ]; then \
docker tag marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/workflow:dev-branch ; \
docker push marconi.aoc.nrao.edu/workspaces/workflow:dev-branch ; \
fi
...
...
@@ -170,7 +170,7 @@ push dev capability:
if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "" ]; then \
echo "Pushing PR branch image to registry: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; \
docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ; \
if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "
development
" ]; then \
if [ "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" != "
main
" ]; then \
docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:dev-branch ; \
docker push marconi.aoc.nrao.edu/workspaces/capability:dev-branch ; \
fi
...
...
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