Merge pull request #2440 from sul-dlss/update-branch-name

Update branch name to main

.github/workflows/ruby.yml

@@ -2,35 +2,35 @@ name: CI
 
 on:
  push:
- branches: [ master ]
+ branches: [main]
  pull_request:
- branches: [ master ]
+ branches: [main]
 
 jobs:
  tests:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- ruby: ['3.2', '3.3']
+ ruby: ["3.2", "3.3"]
  steps:
- - uses: actions/checkout@v4
- - name: Set up Ruby
- uses: ruby/setup-ruby@v1
- with:
- ruby-version: ${{ matrix.ruby }}
- - uses: actions/cache@v4
- with:
- path: vendor/bundle
- key: ${{ runner.os }}-gems-202103-${{ hashFiles('**/Gemfile.lock') }}
- restore-keys: |
- ${{ runner.os }}-gems-202103
- - name: Bundle install
- run: bundle config path vendor/bundle
- - name: Use sidekiq pro
- env:
- BUNDLE_GEMS__CONTRIBSYS__COM: ${{ secrets.BUNDLE_GEMS__CONTRIBSYS__COM }}
- run: bundle config --local gems.contribsys.com ${BUNDLE_GEMS__CONTRIBSYS__COM}
- - name: Install dependencies
- run: bin/setup && bin/rails db:test:prepare
- - name: Run tests
- run: bundle exec rake
+  - uses: actions/checkout@v4
+  - name: Set up Ruby
+  uses: ruby/setup-ruby@v1
+  with:
+  ruby-version: ${{ matrix.ruby }}
+  - uses: actions/cache@v4
+  with:
+  path: vendor/bundle
+  key: ${{ runner.os }}-gems-202103-${{ hashFiles('**/Gemfile.lock') }}
+  restore-keys: |
+  ${{ runner.os }}-gems-202103
+  - name: Bundle install
+  run: bundle config path vendor/bundle
+  - name: Use sidekiq pro
+  env:
+  BUNDLE_GEMS__CONTRIBSYS__COM: ${{ secrets.BUNDLE_GEMS__CONTRIBSYS__COM }}
+  run: bundle config --local gems.contribsys.com ${BUNDLE_GEMS__CONTRIBSYS__COM}
+  - name: Install dependencies
+  run: bin/setup && bin/rails db:test:prepare
+  - name: Run tests
+  run: bundle exec rake

Jenkinsfile

@@ -12,7 +12,7 @@ pipeline {
  }
 
  when {
- branch 'master'
+ branch 'main'
  }
 
  steps {

README.md

@@ -2,7 +2,7 @@
 
 # SUL Spotlight Exhibit
 
-The project's `master` branch provides a template Spotlight application with SUL branding and functionality.
+The project's `main` branch provides a template Spotlight application with SUL branding and functionality.
 
 ## Configuration
 

config/deploy.rb

@@ -1,8 +1,12 @@
 set :application, 'spotlight'
 set :repo_url, 'https://github.com/sul-dlss/exhibits.git'
 
-# Default branch is :master
-ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call unless ENV['DEPLOY']
+# Default branch is :master so we need to update to main
+if ENV['DEPLOY']
+ set :branch, 'main'
+else
+ ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
+end
 
 # Default deploy_to directory is /var/www/my_app
 set :deploy_to, "/opt/app/exhibits/exhibits"