瀏覽代碼

Merge pull request #1187 from nextcloud/fix-drone

Fix drone yml escaping
Tobias Kaminsky 8 年之前
父節點
當前提交
cfaf1f62e7
共有 3 個文件被更改,包括 6 次插入27 次删除
  1. 5 4
      .drone.yml
  2. 0 22
      .drone.yml.sig
  3. 1 1
      scripts/lint/lint-results.txt

+ 5 - 4
.drone.yml

@@ -3,7 +3,7 @@ pipeline:
     image: nextcloudci/android:android-18
     commands:
       # uncomment gplay for Gplay, Modified only
-      - sh -c "if [ '$FLAVOUR' != 'Generic' ]; then sed -i '/com.google.*.gms/s/^.*\/\///g' build.gradle; fi"
+      - sh -c "if [ '$FLAVOUR' != 'Generic' ]; then sed -i '/com.google.*.gms/s/^.*\\/\\///g' build.gradle; fi"
 
       # - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M
       # - emulator -avd test -no-window &
@@ -32,9 +32,10 @@ pipeline:
       image: nextcloudci/android:android-18
       commands:
         # needs gplay
-        - sed -i '/com.google.*.gms/s/^.*\/\///g' build.gradle
-        - 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}
+        - sed -i '/com.google.*.gms/s/^.*\\/\\///g' build.gradle
+        - 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
+      secrets: [ GIT_USERNAME, GIT_TOKEN, LOG_USERNAME, LOG_PASSWORD ]
       when:
         matrix:
           FLAVOUR: Modified

+ 0 - 22
.drone.yml.sig

@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8"/>
-  <meta content="width=device-width, initial-scale=1" name="viewport"/>
-  <meta content="ie=edge" http-equiv="x-ua-compatible"/>
-	<meta name="csrf-token" content="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZXh0IjoidG9iaWFzS2FtaW5za3kiLCJ0eXBlIjoiY3NyZiJ9.prE-2Gl0j_W5KkCmDdlV117apFcLwaMi-JOe1j0OQsc" />
-  <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"/>
-  <link href="https://fonts.googleapis.com/css?family=Roboto+Mono" rel="stylesheet"/>
-  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/>
-  <link href="/static/app.css" rel="stylesheet"/>
-  <link href="/static/favicon.ico" rel="icon" type="image/x-icon"/>
-</head>
-<body>
-<div id="app"></div>
-<script>
-  window.STATE_FROM_SERVER={"csrf":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZXh0IjoidG9iaWFzS2FtaW5za3kiLCJ0eXBlIjoiY3NyZiJ9.prE-2Gl0j_W5KkCmDdlV117apFcLwaMi-JOe1j0OQsc","user":{"id":9,"login":"tobiasKaminsky","email":"tobias@nextcloud.com","avatar_url":"https://avatars0.githubusercontent.com/u/5836855?v=3","active":false}};
-</script>
-<script src="https://code.getmdl.io/1.1.3/material.min.js"></script>
-<script src="/static/app.js"></script>
-</body>
-</html>

+ 1 - 1
scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 71 errors and 853 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 71 errors and 846 warnings</span>