浏览代码

changes due to CR

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 7 年之前
父节点
当前提交
384eeb40cc
共有 3 个文件被更改,包括 2 次插入3 次删除
  1. 0 1
      .drone.yml
  2. 1 1
      .gitignore
  3. 1 1
      scripts/lint/getBranchName.sh

+ 0 - 1
.drone.yml

@@ -12,7 +12,6 @@ pipeline:
     image: nextcloudci/android:android-33
     image: nextcloudci/android:android-33
     commands:
     commands:
       # needs gplay
       # needs gplay
-      - sed -i '/.*com.google.*/s/^.*\\/\\///g' build.gradle
       - export BRANCH=$(scripts/lint/getBranchName.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST)
       - export BRANCH=$(scripts/lint/getBranchName.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST)
       - scripts/lint/lint-up-wrapper.sh $GIT_USERNAME $GIT_TOKEN $BRANCH $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER
       - scripts/lint/lint-up-wrapper.sh $GIT_USERNAME $GIT_TOKEN $BRANCH $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER
     secrets: [ GIT_USERNAME, GIT_TOKEN, LOG_USERNAME, LOG_PASSWORD ]
     secrets: [ GIT_USERNAME, GIT_TOKEN, LOG_USERNAME, LOG_PASSWORD ]

+ 1 - 1
.gitignore

@@ -56,4 +56,4 @@ freeline_project_description.json
 .gradle/
 .gradle/
 build/
 build/
 .idea/
 .idea/
-/gradle.properties
+/gradle.properties

+ 1 - 1
scripts/lint/getBranchName.sh

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