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
Automate
Agent sessions
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
13a2f994
Commit
13a2f994
authored
Jul 18, 2014
by
Emmanuel Lepage Vallee
Committed by
Tristan Matthews
Sep 11, 2014
Browse files
Options
Downloads
Patches
Plain Diff
build-system: Allow emergency patches to streamline the release process
Refs: #51465 Change-Id: I513996df42d9662e1dae401a2768bc210fe470ae
parent
d1a35000
No related branches found
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/build-system/launch-build-machine-jenkins.sh
+15
-1
15 additions, 1 deletion
tools/build-system/launch-build-machine-jenkins.sh
with
15 additions
and
1 deletion
tools/build-system/launch-build-machine-jenkins.sh
+
15
−
1
View file @
13a2f994
...
@@ -155,6 +155,16 @@ fi
...
@@ -155,6 +155,16 @@ fi
# If release, checkout the latest tag
# If release, checkout the latest tag
if
[
${
IS_RELEASE
}
]
;
then
if
[
${
IS_RELEASE
}
]
;
then
git checkout
${
CURRENT_RELEASE_TAG_NAME
}
git checkout
${
CURRENT_RELEASE_TAG_NAME
}
# When we need to apply an emergency patch for the release builds
# This should only be used to temporarily patch packaging tools, not
# daemon/client code (or anything else that build_tarball would grab).
if
[
-d
/tmp/sflphone_release_patch
]
;
then
echo
"Applying patch(es) to packaging tools..."
git apply /tmp/sflphone_release_patch/
*
rm
-rf
/tmp/sflphone_release_patch
REQUIRE_RESET
=
1
fi
fi
fi
echo
"Retrieve build info"
echo
"Retrieve build info"
...
@@ -303,6 +313,10 @@ done
...
@@ -303,6 +313,10 @@ done
# Archive source tarball for Debian maintainer
# Archive source tarball for Debian maintainer
.
${
WORKING_DIR
}
/build_tarball.sh
${
SOFTWARE_VERSION
}
.
${
WORKING_DIR
}
/build_tarball.sh
${
SOFTWARE_VERSION
}
# Undo any modifications caused by temporary patches
if
[
"
$REQUIRE_RESET
"
==
"1"
]
;
then
git reset
--hard
fi
# close file descriptor
# close file descriptor
exec
3>&-
exec
3>&-
...
...
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
sign in
to comment