Fix release kind detection #7031
Conversation
Signed-off-by: István Váradi <[email protected]>
ivaradi
force-pushed
the
release_kind_fix
branch
from
23c2f19 to
96abca2
Compare
|
AppImage file: nextcloud-PR-7031-96abca232895f3e6b6ef5d544c79f804ed54d86b-x86_64.AppImage |
|
|
/backport to stable-3.13 |
|
/backport to stable-3.14 |
|
The backport to # Switch to the target branch and update it
git checkout stable-3.13
git pull origin stable-3.13
# Create the new backport branch
git checkout -b backport/7031/stable-3.13
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 96abca23
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/7031/stable-3.13Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
The backport to # Switch to the target branch and update it
git checkout stable-3.14
git pull origin stable-3.14
# Create the new backport branch
git checkout -b backport/7031/stable-3.14
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 96abca23
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/7031/stable-3.14Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
/backport to stable-3.14 |
|
The backport to # Switch to the target branch and update it
git checkout stable-3.14
git pull origin stable-3.14
# Create the new backport branch
git checkout -b backport/7031/stable-3.14
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 96abca23
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/7031/stable-3.14Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
The changes last made to the Ubuntu/Debian build scripts do not work well on the stable branches, as it is not detected properly if we are dealing with a release or not. This patch fixes this problem.