Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
4497f20f
Commit
4497f20f
authored
15 years ago
by
Julien Bonjean
Browse files
Options
Downloads
Patches
Plain Diff
[#1317] Changed tag convention
parent
46796b77
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/build-system/launch-build-machine.sh
+1
-1
1 addition, 1 deletion
tools/build-system/launch-build-machine.sh
tools/build-system/sfl-git-dch.sh
+3
-3
3 additions, 3 deletions
tools/build-system/sfl-git-dch.sh
with
4 additions
and
4 deletions
tools/build-system/launch-build-machine.sh
+
1
−
1
View file @
4497f20f
...
...
@@ -220,7 +220,7 @@ if [ ${DO_PREPARE} ]; then
exit
-1
fi
VERSION
=
`
cd
${
REPOSITORY_DIR
}
&&
git describe
--tag
HEAD
|
cut
-d
"
/"
-f2
|
cut
-d
"-
"
-f1
`
VERSION
=
`
cd
${
REPOSITORY_DIR
}
&&
git describe
--tag
HEAD |
cut
-d
"
.
"
-f1
-3
`
if
[
${
RELEASE_MODE
}
]
;
then
if
[
"
${
RELEASE_MODE
}
"
!=
"release"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
tools/build-system/sfl-git-dch.sh
+
3
−
3
View file @
4497f20f
...
...
@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-13
# Last Modified: 2009-0
5
-2
9
14:
23:50
-0400
# Last Modified: 2009-0
6
-2
2
14:
40:21
-0400
#####################################################
# set -x
...
...
@@ -35,7 +35,7 @@ if [ "$?" -ne "0" ]; then
fi
# get last release tag
LAST_RELEASE_TAG_NAME
=
`
git tag
-l
"
debian/*ubuntu*"
|
grep
-E
"ubuntu[1
-9]
(
\.
rc[1
-9]
|
\.
beta|
\.
stable)$
"
|
tail
-n
1
`
LAST_RELEASE_TAG_NAME
=
`
git tag
-l
"
[0
-9]
\.
[0
-9]
\.
[0-9]
\.
*
"
|
tail
-n
1
`
if
[
"
$?
"
-ne
"0"
]
;
then
echo
" !! Error when retrieving last tag"
...
...
@@ -43,7 +43,7 @@ if [ "$?" -ne "0" ]; then
fi
# get last release tag
PREVIOUS_RELEASE_TAG_NAME
=
`
git tag
-l
"
debian/*ubuntu*"
|
grep
-E
"ubuntu[1
-9]
(
\.
rc[1
-9]
|
\.
beta|
\.
stable)$
"
|
tail
-n
2 |
sed
-n
'1p;1q'
`
PREVIOUS_RELEASE_TAG_NAME
=
`
git tag
-l
"
[0
-9]
\.
[0
-9]
\.
[0-9]
\.
*
"
|
tail
-n
2 |
sed
-n
'1p;1q'
`
if
[
"
$?
"
-ne
"0"
]
;
then
echo
" !! Error when retrieving previous revision tag"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment