Skip to content

Commit 9de47ad

Browse files
lmarinilmarini
committed
Ranaming master branch to main.
1 parent f28c203 commit 9de47ad

File tree

11 files changed

+21
-21
lines changed

11 files changed

+21
-21
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
push:
1515
branches:
16-
- master
16+
- main
1717
- develop
1818

1919
pull_request:
@@ -39,7 +39,7 @@ jobs:
3939
BRANCH=${GITHUB_REF##*/}
4040
fi
4141
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
42-
if [ "$BRANCH" == "master" ]; then
42+
if [ "$BRANCH" == "main" ]; then
4343
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
4444
elif [ "$BRANCH" == "develop" ]; then
4545
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
@@ -94,7 +94,7 @@ jobs:
9494
BRANCH=${GITHUB_REF##*/}
9595
fi
9696
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
97-
if [ "$BRANCH" == "master" ]; then
97+
if [ "$BRANCH" == "main" ]; then
9898
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
9999
elif [ "$BRANCH" == "develop" ]; then
100100
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
@@ -139,7 +139,7 @@ jobs:
139139
BRANCH=${GITHUB_REF##*/}
140140
fi
141141
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
142-
if [ "$BRANCH" == "master" ]; then
142+
if [ "$BRANCH" == "main" ]; then
143143
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
144144
elif [ "$BRANCH" == "develop" ]; then
145145
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
@@ -216,7 +216,7 @@ jobs:
216216
BRANCH=${GITHUB_REF##*/}
217217
fi
218218
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
219-
if [ "$BRANCH" == "master" ]; then
219+
if [ "$BRANCH" == "main" ]; then
220220
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
221221
elif [ "$BRANCH" == "develop" ]; then
222222
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV

‎.github/workflows/docker.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Docker
55
# and would not set the right version flags.
66

77
# This will run when:
8-
# - when new code is pushed to master/develop to push the tags
8+
# - when new code is pushed to main/develop to push the tags
99
# latest and develop
1010
# - when a pull request is created and updated to make sure the
1111
# Dockerfile is still valid.
@@ -16,14 +16,14 @@ name: Docker
1616
on:
1717
push:
1818
branches:
19-
- master
19+
- main
2020
- develop
2121

2222
pull_request:
2323

24-
# Certain actions will only run when this is the master repo.
24+
# Certain actions will only run when this is the main repo.
2525
env:
26-
MASTER_REPO: clowder-framework/clowder
26+
main_REPO: clowder-framework/clowder
2727
DOCKERHUB_ORG: clowder
2828

2929
jobs:
@@ -77,7 +77,7 @@ jobs:
7777
BRANCH=${GITHUB_REF##*/}
7878
fi
7979
80-
if [ "$BRANCH" == "master" ]; then
80+
if [ "$BRANCH" == "main" ]; then
8181
version="$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
8282
tags="latest"
8383
oldversion=""
@@ -198,7 +198,7 @@ jobs:
198198
199199
# update README at DockerHub
200200
- name: Docker Hub Description
201-
if: env.dockerhub != '' && matrix.README != '' && github.event_name == 'push' && github.repository == env.MASTER_REPO && env.BRANCH == 'master'
201+
if: env.dockerhub != '' && matrix.README != '' && github.event_name == 'push' && github.repository == env.main_REPO && env.BRANCH == 'main'
202202
uses: peter-evans/dockerhub-description@v2
203203
env:
204204
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

‎.github/workflows/swagger.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: swagger
22

33
# This will run when:
4-
# - when new code is pushed to master/develop to make sure the
4+
# - when new code is pushed to main/develop to make sure the
55
# code does compile.
66
# - when a pull request is created and updated to make sure the
77
# code does compile.
88
on:
99
push:
1010
branches:
11-
- master
11+
- main
1212
- develop
1313

1414
pull_request:

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ below. By participating in this project, you agree to abide by the [code of cond
55
Before your code can be accepted, you will have to sign a [CLA](https://clowderframework.org/pdf/Clowder-CLA.pdf)
66
and mail it to [email protected].
77

8-
Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `master` and `develop` branches are pushed to
8+
Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `` and `develop` branches are pushed to
99
[GitHub][github] nightly.
1010

1111
We encourage contributors to create an account on [NCSA Bitbucket][bitbucket] and make pull requests there. We also accept

‎INSTALL.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Next we install the script that will install or update clowder.
8585
cat > /home/browndog/update-clowder.sh << EOF
8686
#!/bin/bash
8787
88-
# CATS-WWW (master) is the main branch for this server
88+
# CATS-WWW () is the main branch for this server
8989
# CATS-WWW1 (develop) if you want the latest version
9090
clowder_BRANCH=${clowder_BRANCH:-"CATS-WWW1"}
9191

‎doc/src/sphinx/_static/logo_full.png‎

-17.6 KB
Binary file not shown.

‎doc/src/sphinx/develop/previewers.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ Previewer can work together with extractors and external services.
1212

1313

1414
Here is a list of previewer embedded with the core
15-
`source <https://github.com/clowder-framework/clowder/tree/master/public/javascripts/previewers>`_.
15+
`source <https://github.com/clowder-framework/clowder/tree//public/javascripts/previewers>`_.

‎doc/src/sphinx/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ be customized and deployed on your own cloud.
2525
`NCSA Opensource <https://opensource.ncsa.illinois.edu/projects/CATS>`_. A copy of the source code can also be found
2626
on `GitHub <https://github.com/clowder-framework>`_.
2727

28-
* We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob/master/CONTRIBUTING.md>`_.
28+
* We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob//CONTRIBUTING.md>`_.
2929

3030
********
3131
Contents

‎project/Build.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object ApplicationBuild extends Build {
1818

1919
def appVersion: String = {
2020
gitBranchName match {
21-
case "master" => getVersion
21+
case "" => getVersion
2222
case _ => s"${getVersion}-develop"
2323
}
2424
}

‎public/swagger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ info:
1616
url: https://clowder.ncsa.illinois.edu/clowder/email
1717
license:
1818
name: The University of Illinois/NCSA Open Source License (NCSA)
19-
url: https://github.com/clowder-framework/clowder/blob/master/LICENSE
19+
url: https://github.com/clowder-framework/clowder/blob//LICENSE
2020

2121
################################################################################
2222
# Servers #

0 commit comments

Comments
 (0)