-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ranaming master
branch to main
.
#436
base: develop
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MASTER_REPO: clowder-framework/clowder
leave as upper case
MAIN_REPO: clowder-framework/clowder
@@ -5,7 +5,7 @@ below. By participating in this project, you agree to abide by the [code of cond | |||
Before your code can be accepted, you will have to sign a [CLA](https://clowderframework.org/pdf/Clowder-CLA.pdf) | |||
and mail it to [email protected]. | |||
|
|||
Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `master` and `develop` branches are pushed to | |||
Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `` and `develop` branches are pushed to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing main
@@ -85,7 +85,7 @@ Next we install the script that will install or update clowder. | |||
cat > /home/browndog/update-clowder.sh << EOF | |||
#!/bin/bash | |||
# CATS-WWW (master) is the main branch for this server | |||
# CATS-WWW () is the main branch for this server |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing main
@@ -12,4 +12,4 @@ Previewer can work together with extractors and external services. | |||
|
|||
|
|||
Here is a list of previewer embedded with the core | |||
`source <https://github.com/clowder-framework/clowder/tree/master/public/javascripts/previewers>`_. | |||
`source <https://github.com/clowder-framework/clowder/tree//public/javascripts/previewers>`_. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing main
@@ -25,7 +25,7 @@ be customized and deployed on your own cloud. | |||
`NCSA Opensource <https://opensource.ncsa.illinois.edu/projects/CATS>`_. A copy of the source code can also be found | |||
on `GitHub <https://github.com/clowder-framework>`_. | |||
|
|||
* We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob/master/CONTRIBUTING.md>`_. | |||
* We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob//CONTRIBUTING.md>`_. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing main
@@ -18,7 +18,7 @@ object ApplicationBuild extends Build { | |||
|
|||
def appVersion: String = { | |||
gitBranchName match { | |||
case "master" => getVersion | |||
case "" => getVersion |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this be main?
@@ -16,7 +16,7 @@ info: | |||
url: https://clowder.ncsa.illinois.edu/clowder/email | |||
license: | |||
name: The University of Illinois/NCSA Open Source License (NCSA) | |||
url: https://github.com/clowder-framework/clowder/blob/master/LICENSE | |||
url: https://github.com/clowder-framework/clowder/blob//LICENSE | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this be main? or only / not //
@@ -19,7 +19,7 @@ BRANCH=${BRANCH:-"$(git rev-parse --abbrev-ref HEAD)"} | |||
BRANCH=${BRANCH} VERSION=${TMPVERSION} DEBUG=${DEBUG} $(dirname $0)/docker.sh | |||
|
|||
# find out the version | |||
if [ "${BRANCH}" = "master" ]; then | |||
if [ "${BRANCH}" = "" ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this be main?
@@ -4,7 +4,7 @@ | |||
set -e | |||
|
|||
# can use the following to push to isda-registry for testing: | |||
# BRANCH="master" SERVER=isda-registry.ncsa.illinois.edu/ ./release.sh | |||
# BRANCH="" SERVER=isda-registry.ncsa.illinois.edu/ ./release.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this be main?
Will just delete master and keep this branch.