Merge pull request #1005 from sul-dlss/rename-branch

.github/workflows/ruby.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   tests:

Jenkinsfile

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

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'