diff --git a/Dockerfile b/Dockerfile index 8993cba..86603ee 100644 --- a/Dockerfile +++ b/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}" diff --git a/config/settings.yml b/config/settings.yml index 5ae86cc..70a53d1 100644 --- a/config/settings.yml +++ b/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/ diff --git a/lib/alma/xml_writer.rb b/lib/alma/xml_writer.rb index e22f9a4..0c1b3cc 100644 --- a/lib/alma/xml_writer.rb +++ b/lib/alma/xml_writer.rb @@ -42,7 +42,7 @@ def ensure_open! def prolog_and_opening_tag tag = "\n" - tag += "\n" + tag += "\n" tag += "\n" tag += "\n" tag += "\n" diff --git a/spec/data/sis/expected_xml_3.xml b/spec/data/sis/expected_xml_3.xml index 8fc9e55..9cb0794 100644 --- a/spec/data/sis/expected_xml_3.xml +++ b/spec/data/sis/expected_xml_3.xml @@ -1,5 +1,5 @@ - + diff --git a/spec/data/ucpath/expected_xml_1.xml b/spec/data/ucpath/expected_xml_1.xml index 0070518..4b9f901 100644 --- a/spec/data/ucpath/expected_xml_1.xml +++ b/spec/data/ucpath/expected_xml_1.xml @@ -1,5 +1,5 @@ - + diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b4323b4..2e2fbb7 100644 --- a/spec/spec_helper.rb +++ b/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