Flesh out deploy script

Add arbitrary change to sources to ensure built binary differs, to ensure we
raise a merge request

Version 0.27 (deploy1.1). Tagged as 'builder-0_27-deploy1_1'

.gitlab-ci.yml

@@ -8,11 +8,22 @@ deploy:
     refs: [ master ]
   tags: [ cross ]
   script:
-    - cat VersionNum
+    # Depending on whether the pipeline is launched by the merge request or
+    # manually, VersionNum may or may not have been updated. Switch to the
+    # tip of master to ensure consistency.
+    - git checkout master
+    - SOURCETAG=$(git describe --abbrev=8 --tags --always)
     # As soon as the CI stuff is merged into the central project, update group and branch identifiers.
     - 'curl --location --output RiscOS.zip "https://gitlab.riscosopen.org/bavison/BuildHost/-/jobs/artifacts/ci/download?job=latest_package_tree"'
     - unzip -q RiscOS.zip
     - shopt -s expand_aliases && source RiscOS/Env/ROOL/BuildHost.sh
     - git clone https://gitbot:$PASSWORD@gitlab.riscosopen.org/gitbot/PlingBuilder
     - COMPONENT=Builder TARGET=Builder INSTDIR=PlingBuilder make -k install
-    - cd PlingBuilder && git diff
+    # If the installed binary has changed in any way, then...
+    # - if major version number is unchanged, then do an untagged merge request
+    #   (most likely this means there have been toolchain and/or library
+    #   changes since the binary was last imported)
+    # - otherwise, create a VersionNum file that is 0.01 behind the source
+    #   component, and let the srccommit instance that runs during the merge
+    #   bring the source and binary versions back to parity
+    - cd PlingBuilder && git diff --quiet --exit-code || ( git checkout -b Import$(echo $SOURCETAG | sed -e 's/[.-_]//g'); if diff <(head -1 ../VersionNum) <(head -1 VersionNum) &> /dev/null; then git add .; git commit -m "Binary import from source version "$SOURCETAG$'\n!NoTag'; else NEXTVER=$(sed $'1s/^.*(\\(.*\\)).*$/\\1/;t\nd' ../VersionNum); INTVER=${NEXTVER%%.*}; FRACVER=${NEXTVER#*.}; FRACVER=${FRACVER#0}; if [ $FRACVER = 0 ]; then INTVER=$((INTVER-1)); FRACVER=99; else FRACVER=$((FRACVER-1)); fi; PREVER=$(printf "%d.%02d" $INTVER $FRACVER); echo "($PREVER)" > VersionNum; git add .; git commit -m "Binary import from source version "$SOURCETAG; fi; git push -o merge_request.create origin )

VersionNum

@@ -4,18 +4,18 @@
  *
  */
 #define Module_MajorVersion_CMHG        0.27
-#define Module_MinorVersion_CMHG        
+#define Module_MinorVersion_CMHG        deploy1.1
 #define Module_Date_CMHG                07 Apr 2020
 
 #define Module_MajorVersion             "0.27"
 #define Module_Version                  27
-#define Module_MinorVersion             ""
+#define Module_MinorVersion             "deploy1.1"
 #define Module_Date                     "07 Apr 2020"
 
 #define Module_ApplicationDate          "07-Apr-20"
 
 #define Module_ComponentName            "builder"
 
-#define Module_FullVersion              "0.27"
-#define Module_HelpVersion              "0.27 (07 Apr 2020)"
+#define Module_FullVersion              "0.27 (deploy1.1)"
+#define Module_HelpVersion              "0.27 (07 Apr 2020) deploy1.1"
 #define Module_LibraryVersionInfo       "0:27"

c/main

@@ -835,7 +835,6 @@ int main(void)
   int quiting=FALSE;
 
   /* Initialise DebugLib */
-  debug_initialise("Builder", "adfs::4.$.BuilderDB", "");
   debug_atexit();
   debug_set_options(DebugLib_Options_StampDebug_Off |
                     DebugLib_Options_TasknamePrefix_Off, 1, 9600);