AP-496: update build variables across the board (#2)

* AP-496: update build variables across the board

* version bump before release

Author: anarchivist

Dockerfile

@@ -122,14 +122,14 @@ RUN bundle install --local
 ARG BUILD_TIMESTAMP
 ARG BUILD_URL
 ARG DOCKER_TAG
-ARG GIT_BRANCH
-ARG GIT_COMMIT
-ARG GIT_URL
+ARG GIT_REF_NAME
+ARG GIT_SHA
+ARG GIT_REPOSITORY_URL
 
 # build arguments aren't persisted in the image, but ENV values are
 ENV BUILD_TIMESTAMP="${BUILD_TIMESTAMP}"
 ENV BUILD_URL="${BUILD_URL}"
 ENV DOCKER_TAG="${DOCKER_TAG}"
-ENV GIT_BRANCH="${GIT_BRANCH}"
-ENV GIT_COMMIT="${GIT_COMMIT}"
-ENV GIT_URL="${GIT_URL}"
+ENV GIT_REF_NAME="${GIT_REF_NAME}"
+ENV GIT_SHA="${GIT_SHA}"
+ENV GIT_REPOSITORY_URL="${GIT_REPOSITORY_URL}"

config/settings.yml

@@ -6,7 +6,7 @@ Settings:
   upload_host: "upload.lib.berkeley.edu"
   upload_user: "ssullivan"
   last_alma_purge: "2023-06-30"
-  application_version: "1.6.0"
+  application_version: "1.6.1"
 
 # TODO - flesh this out
 # http://docopt.org/

lib/alma/xml_writer.rb

@@ -42,7 +42,7 @@ def ensure_open!
 
     def prolog_and_opening_tag
       tag = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-      tag += "<!-- GIT_COMMIT:#{ENV['GIT_COMMIT']} -->\n"
+      tag += "<!-- GIT_SHA:#{ENV['GIT_SHA']} -->\n"
       tag += "<!-- DOCKER_TAG:#{ENV['DOCKER_TAG']} -->\n"
       tag += "<!-- VERSION: #{ENV['VERSION']} -->\n"
       tag += "<!-- CHANGE_LOG_COUNT: #{change_log_count} -->\n"

spec/data/sis/expected_xml_3.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- GIT_COMMIT:LOCAL_TESTING -->
+<!-- GIT_SHA:LOCAL_TESTING -->
 <!-- DOCKER_TAG:DEV -->
 <!-- VERSION: VERSIONNUMBER -->
 <!-- CHANGE_LOG_COUNT:  -->

spec/data/ucpath/expected_xml_1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- GIT_COMMIT:LOCAL_TESTING -->
+<!-- GIT_SHA:LOCAL_TESTING -->
 <!-- DOCKER_TAG:DEV -->
 <!-- VERSION: 1.5.4 -->
 <users>

spec/spec_helper.rb

@@ -38,7 +38,7 @@
 RSpec.configure do |config|
   # Mock ENVs for testing
   config.before(:each) do
-    ENV['GIT_COMMIT'] = 'LOCAL_TESTING'
+    ENV['GIT_SHA'] = 'LOCAL_TESTING'
     ENV['DOCKER_TAG'] = 'DEV'
   end