Merge branch 'patch-29' into 'master'
Update Android.gitlab-ci.yml for current stable SDK See merge request gitlab-org/gitlab-ce!22336
This commit is contained in:
commit
0a89c0b864
|
@ -2,33 +2,33 @@
|
|||
image: openjdk:8-jdk
|
||||
|
||||
variables:
|
||||
ANDROID_COMPILE_SDK: "25"
|
||||
ANDROID_BUILD_TOOLS: "24.0.0"
|
||||
ANDROID_SDK_TOOLS: "24.4.1"
|
||||
ANDROID_COMPILE_SDK: "28"
|
||||
ANDROID_BUILD_TOOLS: "28.0.3"
|
||||
ANDROID_SDK_TOOLS: "26.1.1"
|
||||
|
||||
before_script:
|
||||
- apt-get --quiet update --yes
|
||||
- apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
|
||||
- wget --quiet --output-document=android-sdk.tgz https://dl.google.com/android/android-sdk_r${ANDROID_SDK_TOOLS}-linux.tgz
|
||||
- tar --extract --gzip --file=android-sdk.tgz
|
||||
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter android-${ANDROID_COMPILE_SDK}
|
||||
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools
|
||||
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter build-tools-${ANDROID_BUILD_TOOLS}
|
||||
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository
|
||||
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services
|
||||
- echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository
|
||||
- export ANDROID_HOME=$PWD/android-sdk-linux
|
||||
- export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
|
||||
- chmod +x ./gradlew
|
||||
- apt-get --quiet update --yes
|
||||
- apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
|
||||
- wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
|
||||
- unzip android-sdk.zip -d android-sdk-linux
|
||||
- echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" > /dev/null
|
||||
- echo y | android-sdk-linux/tools/bin/sdkmanager platform-tools > /dev/null
|
||||
- echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" > /dev/null
|
||||
- echo y | android-sdk-linux/tools/bin/sdkmanager "extras;google;google_play_services" > /dev/null
|
||||
- echo y | android-sdk-linux/tools/bin/sdkmanager "extras;google;m2repository" > /dev/null
|
||||
- export ANDROID_HOME=$PWD/android-sdk-linux
|
||||
- export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
|
||||
- yes | android-sdk-linux/tools/bin/sdkmanager --licenses &
|
||||
- chmod +x ./gradlew
|
||||
|
||||
stages:
|
||||
- build
|
||||
- test
|
||||
- build
|
||||
- test
|
||||
|
||||
build:
|
||||
stage: build
|
||||
script:
|
||||
- ./gradlew assembleDebug
|
||||
- ./gradlew assembleDebug
|
||||
artifacts:
|
||||
paths:
|
||||
- app/build/outputs/
|
||||
|
@ -36,7 +36,7 @@ build:
|
|||
unitTests:
|
||||
stage: test
|
||||
script:
|
||||
- ./gradlew test
|
||||
- ./gradlew test
|
||||
|
||||
functionalTests:
|
||||
stage: test
|
||||
|
|
Loading…
Reference in New Issue