Merge branch 'develop' into 'master'

修改小错误

See merge request SilverBlog/SilverBlog_Android!75

Author: qwe7002

.gitlab-ci.yml

@@ -19,13 +19,13 @@ release_github:
 
 
 build:
-  image: preventis/docker-android-alpine
+  image: preventis/docker-android-alpine:latest
   stage: build
   only:
   - master
   script:
   - echo -e "ext {\n appVersionCode = ${CI_PIPELINE_ID}\n appVersionName = \"_${CI_JOB_ID}\"}" > ./app/version.gradle
-  - echo -e "systemProp.http.proxyHost=192.168.3.8\n systemProp.http.proxyPort=1080\n systemProp.https.proxyHost=192.168.3.8\n systemProp.https.proxyPort=1080\n org.gradle.jvmargs=-Xmx1536m\n org.gradle.parallel=true" >> gradle.properties
+  - echo -e "systemProp.http.nonProxyHosts=dl.google.com\n systemProp.http.proxyHost=192.168.3.8\n systemProp.http.proxyPort=1080\n systemProp.https.proxyHost=192.168.3.8\n systemProp.https.proxyPort=1080\n org.gradle.jvmargs=-Xmx1536m\n org.gradle.parallel=true" >> gradle.properties
   - export GRADLE_USER_HOME=$(pwd)/.gradle
   - chmod +x ./gradlew
   - ./gradlew assembleRelease