From 9de47ade1ea45a236bf508a2b58dc511ada27096 Mon Sep 17 00:00:00 2001 From: Luigi Marini Date: Mon, 13 Nov 2023 09:43:15 -0600 Subject: [PATCH] Ranaming `master` branch to `main`. --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/docker.yml | 12 ++++++------ .github/workflows/swagger.yml | 4 ++-- CONTRIBUTING.md | 2 +- INSTALL.md | 2 +- doc/src/sphinx/_static/logo_full.png | Bin 18068 -> 0 bytes doc/src/sphinx/develop/previewers.rst | 2 +- doc/src/sphinx/index.rst | 2 +- project/Build.scala | 2 +- public/swagger.yml | 2 +- release.sh | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 doc/src/sphinx/_static/logo_full.png diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a77d911b5..9eb79da03 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ on: push: branches: - - master + - main - develop pull_request: @@ -39,7 +39,7 @@ jobs: BRANCH=${GITHUB_REF##*/} fi echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV - if [ "$BRANCH" == "master" ]; then + if [ "$BRANCH" == "main" ]; then echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV elif [ "$BRANCH" == "develop" ]; then echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV @@ -94,7 +94,7 @@ jobs: BRANCH=${GITHUB_REF##*/} fi echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV - if [ "$BRANCH" == "master" ]; then + if [ "$BRANCH" == "main" ]; then echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV elif [ "$BRANCH" == "develop" ]; then echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV @@ -139,7 +139,7 @@ jobs: BRANCH=${GITHUB_REF##*/} fi echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV - if [ "$BRANCH" == "master" ]; then + if [ "$BRANCH" == "main" ]; then echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV elif [ "$BRANCH" == "develop" ]; then echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV @@ -216,7 +216,7 @@ jobs: BRANCH=${GITHUB_REF##*/} fi echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV - if [ "$BRANCH" == "master" ]; then + if [ "$BRANCH" == "main" ]; then echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV elif [ "$BRANCH" == "develop" ]; then echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7702ae180..e8823d464 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,7 +5,7 @@ name: Docker # and would not set the right version flags. # This will run when: -# - when new code is pushed to master/develop to push the tags +# - when new code is pushed to main/develop to push the tags # latest and develop # - when a pull request is created and updated to make sure the # Dockerfile is still valid. @@ -16,14 +16,14 @@ name: Docker on: push: branches: - - master + - main - develop pull_request: -# Certain actions will only run when this is the master repo. +# Certain actions will only run when this is the main repo. env: - MASTER_REPO: clowder-framework/clowder + main_REPO: clowder-framework/clowder DOCKERHUB_ORG: clowder jobs: @@ -77,7 +77,7 @@ jobs: BRANCH=${GITHUB_REF##*/} fi - if [ "$BRANCH" == "master" ]; then + if [ "$BRANCH" == "main" ]; then version="$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" tags="latest" oldversion="" @@ -198,7 +198,7 @@ jobs: # update README at DockerHub - name: Docker Hub Description - if: env.dockerhub != '' && matrix.README != '' && github.event_name == 'push' && github.repository == env.MASTER_REPO && env.BRANCH == 'master' + if: env.dockerhub != '' && matrix.README != '' && github.event_name == 'push' && github.repository == env.main_REPO && env.BRANCH == 'main' uses: peter-evans/dockerhub-description@v2 env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml index b55dfb26f..dd3f0715f 100644 --- a/.github/workflows/swagger.yml +++ b/.github/workflows/swagger.yml @@ -1,14 +1,14 @@ name: swagger # This will run when: -# - when new code is pushed to master/develop to make sure the +# - when new code is pushed to main/develop to make sure the # code does compile. # - when a pull request is created and updated to make sure the # code does compile. on: push: branches: - - master + - main - develop pull_request: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a2fd3f99..0187dc6d2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 lmarini@illinois.edu. -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 [GitHub][github] nightly. We encourage contributors to create an account on [NCSA Bitbucket][bitbucket] and make pull requests there. We also accept diff --git a/INSTALL.md b/INSTALL.md index ae9c8ba33..dc1c5e0ab 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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 # CATS-WWW1 (develop) if you want the latest version clowder_BRANCH=${clowder_BRANCH:-"CATS-WWW1"} diff --git a/doc/src/sphinx/_static/logo_full.png b/doc/src/sphinx/_static/logo_full.png deleted file mode 100644 index 0ecf1c8413f241bed62d96ae0e43d02f0bb446ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18068 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 diff --git a/doc/src/sphinx/develop/previewers.rst b/doc/src/sphinx/develop/previewers.rst index b9dc3da31..71da64895 100644 --- a/doc/src/sphinx/develop/previewers.rst +++ b/doc/src/sphinx/develop/previewers.rst @@ -12,4 +12,4 @@ Previewer can work together with extractors and external services. Here is a list of previewer embedded with the core -`source `_. +`source `_. diff --git a/doc/src/sphinx/index.rst b/doc/src/sphinx/index.rst index 25dc21225..7b067518f 100644 --- a/doc/src/sphinx/index.rst +++ b/doc/src/sphinx/index.rst @@ -25,7 +25,7 @@ be customized and deployed on your own cloud. `NCSA Opensource `_. A copy of the source code can also be found on `GitHub `_. - * We are always looking for `contributions `_. + * We are always looking for `contributions `_. ******** Contents diff --git a/project/Build.scala b/project/Build.scala index 585a8137b..ce954ab85 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -18,7 +18,7 @@ object ApplicationBuild extends Build { def appVersion: String = { gitBranchName match { - case "master" => getVersion + case "" => getVersion case _ => s"${getVersion}-develop" } } diff --git a/public/swagger.yml b/public/swagger.yml index 221e16ff2..f9338cd80 100644 --- a/public/swagger.yml +++ b/public/swagger.yml @@ -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 ################################################################################ # Servers # diff --git a/release.sh b/release.sh index ec6c83ba8..e80f404dc 100755 --- a/release.sh +++ b/release.sh @@ -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 # use DEBUG=echo ./release.sh to print all commands DEBUG=${DEBUG:-""} @@ -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 VERSION=${VERSION:-""} if [ "${VERSION}" = "" ]; then TMPVERSION=$(awk '/version = / { print $4 }' $(dirname $0)/project/Build.scala | sed 's/"//g')