Skip to content

Commit

Permalink
Merge pull request #596 from nextcloud/bumpTo2.6
Browse files Browse the repository at this point in the history
Bump to 2.6 rc1
  • Loading branch information
tobiasKaminsky authored Mar 16, 2021
2 parents fc4a113 + 9e01ae0 commit cca2c53
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ steps:
status:
- failure
branch:
- master
- stable-2.6

trigger:
branch:
- master
- stable-2.6
event:
- pull_request
- push
Expand Down Expand Up @@ -89,7 +89,7 @@ steps:
status:
- failure
branch:
- master
- stable-2.6

services:
- name: server-master
Expand Down Expand Up @@ -117,7 +117,7 @@ services:

trigger:
branch:
- master
- stable-2.6
event:
- push
- pull_request
Expand Down Expand Up @@ -173,7 +173,7 @@ steps:
status:
- failure
branch:
- master
- stable-2.6

services:
- name: server-stable
Expand Down Expand Up @@ -245,11 +245,11 @@ steps:
status:
- failure
branch:
- master
- stable-2.6

trigger:
branch:
- master
- stable-2.6
event:
- push
- pull_request
2 changes: 1 addition & 1 deletion scripts/analysis/analysis-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#6: DRONE_BUILD_NUMBER
#7: PULL_REQUEST_NUMBER

stableBranch="master"
stableBranch="stable-2.6"
repository="library"

ruby scripts/analysis/lint-up.rb $1 $2 $3
Expand Down
4 changes: 2 additions & 2 deletions scripts/analysis/getBranchName.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# $1: username, $2: password/token, $3: pull request number

if [ -z $3 ] ; then
echo "master";
echo "stable-2.6";
else
curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android-library/pulls/$3 | grep \"ref\": | grep -v '"master"' | cut -d"\"" -f4
curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android-library/pulls/$3 | grep \"ref\": | grep -v '"stable-2.6"' | cut -d"\"" -f4
fi

0 comments on commit cca2c53

Please sign in to comment.