Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
RiscOS
T
Tools
Sources
Squish
Commits
574ec288
Commit
574ec288
authored
3 years ago
by
Ben Avison
Browse files
Options
Download
Email Patches
Plain Diff
Enable CI/CD
parent
224b1d00
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
2 deletions
+28
-2
.gitlab-ci.yml
.gitlab-ci.yml
+26
-0
VersionNum
VersionNum
+1
-1
bas/Squish
bas/Squish
+1
-1
No files found.
.gitlab-ci.yml
0 → 100644
View file @
574ec288
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 )
This diff is collapsed.
Click to expand it.
VersionNum
View file @
574ec288
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
bas/Squish
View file @
574ec288
...
...
@@ -1399,7 +1399,7 @@ IF y%<>0 THEN
IF
((
f%
AND
1
)=
0
)
AND
((
c%
AND
&FF000000
)=
0
)
THEN
slot%
=
FN
alloc
(
4
+
4
+
LEN
(
name$
)+
1
)
slot%
!
0
=
syslist%
:
slot%
!
4
=
c%
:
$(
slot%
+
8
)=
name$
syslist%
=
slot%
syslist%
=
slot%
ENDIF
ENDIF
ENDIF
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment