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
Ben Avison
builder
Commits
b535d9f2
Commit
b535d9f2
authored
Apr 14, 2020
by
Ben Avison
Committed by
ROOL
Apr 14, 2020
Browse files
Simplify path to binary component
Version 0.33. Tagged as 'builder-0_33'
parent
470037c0
Pipeline
#373
passed with stages
in 20 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
15 deletions
+13
-15
.gitlab-ci.yml
.gitlab-ci.yml
+3
-5
VersionNum
VersionNum
+10
-10
No files found.
.gitlab-ci.yml
View file @
b535d9f2
...
...
@@ -19,10 +19,8 @@ deploy:
-
'
curl
--location
--output
RiscOS.zip
$zflag
"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
-
make links
-
ln -s ../PlingBuilder objs/!Builder
-
COMPONENT=Builder TARGET=Builder INSTDIR=. make install
-
git clone https://gitbot:$PASSWORD@gitlab.riscosopen.org/gitbot/PlingBuilder !Builder
-
COMPONENT=Builder TARGET=Builder INSTDIR=.. make install
# 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
...
...
@@ -30,7 +28,7 @@ deploy:
# - 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
Pling
Builder && git diff --quiet --exit-code || ( git checkout -b $BRANCH; 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; printf "(%d.%02d)" $INTVER $FRACVER > VersionNum; git add .; git commit -m "Binary import from source version "$SOURCETAG; fi; git push -o merge_request.create origin $BRANCH )
-
cd
!
Builder && git diff --quiet --exit-code || ( git checkout -b $BRANCH; 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; printf "(%d.%02d)" $INTVER $FRACVER > VersionNum; git add .; git commit -m "Binary import from source version "$SOURCETAG; fi; git push -o merge_request.create origin $BRANCH )
cache
:
key
:
BuildHost
paths
:
[
RiscOS.zip
]
VersionNum
View file @
b535d9f2
/* (0.3
2
)
/* (0.3
3
)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.3
2
#define Module_MajorVersion_CMHG 0.3
3
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG
08
Apr 2020
#define Module_Date_CMHG
14
Apr 2020
#define Module_MajorVersion "0.3
2
"
#define Module_Version 3
2
#define Module_MajorVersion "0.3
3
"
#define Module_Version 3
3
#define Module_MinorVersion ""
#define Module_Date "
08
Apr 2020"
#define Module_Date "
14
Apr 2020"
#define Module_ApplicationDate "
08
-Apr-20"
#define Module_ApplicationDate "
14
-Apr-20"
#define Module_ComponentName "builder"
#define Module_FullVersion "0.3
2
"
#define Module_HelpVersion "0.3
2
(
08
Apr 2020)"
#define Module_LibraryVersionInfo "0:3
2
"
#define Module_FullVersion "0.3
3
"
#define Module_HelpVersion "0.3
3
(
14
Apr 2020)"
#define Module_LibraryVersionInfo "0:3
3
"
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