Skip to content
Snippets Groups Projects
Commit 346d169d authored by jenkins's avatar jenkins
Browse files

New release.

parents 98ba27ef 72e99584
No related branches found
No related tags found
No related merge requests found
......@@ -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)"
......
client-gnome @ ec8eef7d
Subproject commit b895550d5d5bba89956edb60f421b283ff14465d
Subproject commit ec8eef7dd3ac175ca923ee42f2b3cc911dd78919
client-qt @ 12277751
Subproject commit cab5a2223ba8fc0571663216f48e9295093fc503
Subproject commit 122777518ae6b09c85b877a1abbdcf35e6795fda
daemon @ 7634487e
Subproject commit 84c7c9de7557f7424d074833cdaeb066bd755ac7
Subproject commit 7634487e9f568ae727f2d4cffbb735d23fa0324c
lrc @ e6cc67f1
Subproject commit 95ad7cd0016a03634c7c8e124479f043586cfe41
Subproject commit e6cc67f188b908bc0dba5341a4bb4ca3bfd15470
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment