Skip to content
Snippets Groups Projects
Commit 993b812c authored by Andrew Kapuscinski's avatar Andrew Kapuscinski
Browse files

changed default branch from development to main

parent 93c1f9eb
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment