Changing to first 7 digits

ystv · Jan 6, 2025 · bc4506e · bc4506e
1 parent d1440f6
commit bc4506e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
           steps {
             script {
               dir("server") {
-                GIT_COMMIT_HASH = sh (script: "git log -n 1 --pretty=format:'%H'", returnStdout: true)
+                GIT_COMMIT_HASH = sh (script: "git log -n 1 --pretty=format:'%H' | head -c 7", returnStdout: true)
                 docker.withRegistry('https://' + registryEndpoint, 'docker-registry') {
                   serverImage = docker.build(serverImageName, "--build-arg STREAMER_VERSION_ARG=${env.BRANCH_NAME}-${env.BUILD_ID} --build-arg STREAMER_COMMIT_ARG=${GIT_COMMIT_HASH} --no-cache .")
                 }

diff --git a/server/templates/_base.tmpl b/server/templates/_base.tmpl
@@ -31,8 +31,8 @@
     {{template "content" .}}
     <br><br>
     {{ $year := thisYear }}
-    <footer id="footer">Streamer (version: {{ getVersion }}, <a href="https://github.com/ystv/streamer/commit/{{ getCommit }}"
-                                                                target="_blank">GitHub (commit: {{ getCommit }})</a>) - created by Liam Burnand 2022{{if ne $year 2022}}-{{ $year }}{{end}}</footer>
+    <footer id="footer">Streamer (<a href="https://github.com/ystv/streamer" target="_blank">version: {{ getVersion }}</a>, <a href="https://github.com/ystv/streamer/commit/{{ getCommit }}"
+                                                                target="_blank">commit: {{ getCommit }}</a>) - created by Liam Burnand 2022{{if ne $year 2022}}-{{ $year }}{{end}}</footer>
     <script>
         const toggleSwitch = document.getElementById("theme_checkbox");