diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 3fe9cb1b..8a3d6536 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: tests: diff --git a/Jenkinsfile b/Jenkinsfile index 87de4a56..6299e18e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { } when { - branch 'master' + branch 'main' } steps { @@ -56,7 +56,7 @@ pipeline { } when { - branch 'master' + branch 'main' } steps { diff --git a/config/deploy.rb b/config/deploy.rb index a5a587bc..df80abbc 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,8 +1,12 @@ set :application, 'digital_stacks' set :repo_url, 'https://github.com/sul-dlss/stacks.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/stacks/stacks'