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
346d169d
Commit
346d169d
authored
3 years ago
by
jenkins
Browse files
Options
Downloads
Plain Diff
New release.
parents
98ba27ef
72e99584
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Jenkinsfile
+2
-1
2 additions, 1 deletion
Jenkinsfile
client-gnome
+1
-1
1 addition, 1 deletion
client-gnome
client-qt
+1
-1
1 addition, 1 deletion
client-qt
daemon
+1
-1
1 addition, 1 deletion
daemon
lrc
+1
-1
1 addition, 1 deletion
lrc
with
6 additions
and
5 deletions
Jenkinsfile
+
2
−
1
View file @
346d169d
...
...
@@ -137,7 +137,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
steps
{
sh
"""git checkout ${params.CHANNEL}
# Submodules are generally not managed by merging
git merge -X theirs --no-commit FETCH_HEAD || git status && git add `git diff --name-status --diff-filter=U | awk '{print \$2}'` ||
true
git merge -X theirs --no-commit FETCH_HEAD || git status && git add `git diff --name-status --diff-filter=U | awk '{print \$2}'` ||
true
"""
}
}
...
...
@@ -156,6 +156,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
steps
{
sh
"""\
#!/usr/bin/env -S bash -l
git status
git commit -am 'New release.'
make portable-release-tarball .tarball-version
git tag \$(cat .tarball-version) -am "Jami \$(cat .tarball-version)"
...
...
This diff is collapsed.
Click to expand it.
client-gnome
@
ec8eef7d
Subproject commit
b895550d5d5bba89956edb60f421b283ff14465d
Subproject commit
ec8eef7dd3ac175ca923ee42f2b3cc911dd78919
This diff is collapsed.
Click to expand it.
client-qt
@
12277751
Subproject commit
cab5a2223ba8fc0571663216f48e9295093fc503
Subproject commit
122777518ae6b09c85b877a1abbdcf35e6795fda
This diff is collapsed.
Click to expand it.
daemon
@
7634487e
Subproject commit
84c7c9de7557f7424d074833cdaeb066bd755ac7
Subproject commit
7634487e9f568ae727f2d4cffbb735d23fa0324c
This diff is collapsed.
Click to expand it.
lrc
@
e6cc67f1
Subproject commit
95ad7cd0016a03634c7c8e124479f043586cfe41
Subproject commit
e6cc67f188b908bc0dba5341a4bb4ca3bfd15470
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