Adjust again.

Jenkinsfile

@@ -44,7 +44,7 @@ pipeline {
     stage('Deploy to Staging') {
       steps {
         slackSend (message: "${currentBuild.fullDisplayName} Deploy to Staging started (<${env.BUILD_URL}|Open>)", color: '#37b787')
-        sh "bundle exec cap staging deploy GIT_BRANCH=${env.GIT_BRANCH}"
+        sh "bundle exec cap staging deploy BRANCH=${env.GIT_BRANCH}"
       }
       post {
         success {
@@ -65,7 +65,7 @@ pipeline {
       }
       steps {
         slackSend (message: "${currentBuild.fullDisplayName} Deploy to Production started (<${env.BUILD_URL}|Open>)", color: '#37b787')
-        sh "bundle exec cap production deploy GIT_BRANCH=${env.GIT_BRANCH}"
+        sh "bundle exec cap production deploy BRANCH=${env.GIT_BRANCH}"
       }
       post {
         success {

config/deploy.rb

@@ -10,6 +10,9 @@
 # Link local configuration
 set :linked_files, [".env.local"]
 
+# Adjust branch if environment variable provided
+set :branch, ENV['BRANCH'] if ENV['BRANCH']
+
 # Default branch is :master
 # ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
 

config/deploy/production.rb

@@ -1,5 +1,4 @@
 set :deploy_to, "/srv/www/thepacer.org/production"
-set :branch, ENV['GIT_BRANCH'] if ENV['GIT_BRANCH']
 
 server "thepacer.org", user: "deploy", roles: %w{app db web}
 

config/deploy/staging.rb

@@ -1,5 +1,4 @@
 set :deploy_to, "/srv/www/thepacer.org/staging"
-set :branch, ENV['BRANCH'] if ENV['BRANCH']
 
 server "thepacer.org", user: "deploy", roles: %w{app db web}