Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
0988cc48
Unverified
Commit
0988cc48
authored
2 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
test
Change-Id: I32e75bdef93a386425fed12ef3b5e1f0d681cbbc
parent
7fb3236a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Jenkinsfile
+2
-2
2 additions, 2 deletions
Jenkinsfile
with
2 additions
and
2 deletions
Jenkinsfile
+
2
−
2
View file @
0988cc48
...
...
@@ -137,10 +137,10 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
steps
{
sh
"""git checkout ${params.CHANNEL}
git status
git reset --hard origin/
nightly
git reset --hard origin/
${params.CHANNEL}
git status
# Submodules are generally not managed by merging
git merge -X theirs --no-commit FETCH_HEAD
|| true
git merge -X theirs --no-commit FETCH_HEAD
git status
git checkout FETCH_HEAD -- daemon lrc client-qt
git status
...
...
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