Commit 26b9243b authored by Ben Avison's avatar Ben Avison
Browse files

Enable CI/CD

parent 8ffb1042
Pipeline #1845 passed with stage
in 3 seconds
variables:
WHITESPACE_WHITELIST: "./Test/Squish,feb"
include:
- project: 'Support/CI'
file: '/Squish.yml'
deploy_to_library:
stage: deploy
only:
refs: [ master ]
tags: [ cross ]
script:
# 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 origin/master
- SOURCETAG=$(git describe --abbrev=8 --tags --always)
- BRANCH=Import$(echo $SOURCETAG | sed -e 's/[-._]//g')
- 'curl --location --output ~/cache/common/BuildHost.zip -z ~/cache/common/BuildHost.zip "https://gitlab.riscosopen.org/Products/BuildHost/-/jobs/artifacts/master/download?job=latest_package_tree"'
- unzip -q ~/cache/common/BuildHost.zip
- source RiscOS/Env/ROOL/BuildHost.sh
- git clone https://$USER:$PASSWORD@gitlab.riscosopen.org/$USER/Library.git
- INSTDIR=../Library/Build mk install
# If the installed binary has changed in any way, raise a merge request
- cd Library && git diff --quiet --exit-code || ( git checkout -b $BRANCH; git add .; git commit -m "Update Squish from tag $SOURCETAG"; git push -o merge_request.create origin $BRANCH )
......@@ -5,7 +5,7 @@
*
*/
#define Module_MajorVersion_CMHG 1.16
#define Module_MinorVersion_CMHG
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 28 Mar 2019
#define Module_MajorVersion "1.16"
......
......@@ -1252,7 +1252,7 @@ IF y%<>0 THEN
IF ((f% AND 1)=0) AND ((c% AND &FF000000)=0) THEN
slot%=FNalloc(4+4+LEN(name$)+1)
slot%!0=syslist%:slot%!4=c%:$(slot%+8)=name$
syslist%=slot%
syslist%=slot%
ENDIF
ENDIF
ENDIF
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment