Skip to content

Commit

Permalink
APPS-656 Replace master branch with main branch (#869)
Browse files Browse the repository at this point in the history
* Rebuild gem file lock

* Replace master with main
  • Loading branch information
pghorpade authored Mar 11, 2021
1 parent 7ef9ffc commit 9fa1448
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ after_success:
JOB=job/DeployCalifornica
API="$JENKINS_API_CALIFORNICA"
if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then
if [[ $TRAVIS_BRANCH == 'main' && $TRAVIS_PULL_REQUEST == 'false' ]]; then
BASE_QUERY="buildWithParameters?token=$API&GIT_BRANCH=$TRAVIS_BRANCH&cause=Travis+Build"
HOST=t-w-californica01.library.ucla.edu
curl "$BASE_URL/$JOB/$BASE_QUERY&DEPLOY_HOST=$HOST"
Expand Down
2 changes: 1 addition & 1 deletion app/indexers/work_indexer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class WorkIndexer < Hyrax::WorkIndexer
# this behavior
include Hyrax::IndexesLinkedMetadata

# See https://github.com/UCLALibrary/californica/blob/master/solr/config/schema.xml#194
# See https://github.com/UCLALibrary/californica/blob/main/solr/config/schema.xml#194
# for extensions that can be used below

def generate_solr_document
Expand Down
4 changes: 2 additions & 2 deletions config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

SSHKit.config.command_map[:rake] = 'bundle exec rake'

set :branch, ENV['REVISION'] || ENV['BRANCH'] || ENV['BRANCH_NAME'] || 'master'
set :branch, ENV['REVISION'] || ENV['BRANCH'] || ENV['BRANCH_NAME'] || 'main'

append :linked_dirs, "log"
append :linked_dirs, "public/assets"
Expand Down Expand Up @@ -92,7 +92,7 @@
# This will fix the translation labels for any collections that are missing them.
after 'deploy:published', 'californica:fix_collection_type_labels'

# Default branch is :master
# Default branch is :main
# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp

# Default deploy_to directory is /var/www/my_app_name
Expand Down

0 comments on commit 9fa1448

Please sign in to comment.