From 7b6bc3fe3e3f6b1199bbf88e8a44abc3e7b6d4b5 Mon Sep 17 00:00:00 2001 From: budtmo Date: Tue, 5 Oct 2021 10:06:46 +0200 Subject: [PATCH] Removed support for Android 5.0.1 and 5.1.1 --- README.md | 2 -- pipelines/release-emulators.yml | 4 ---- release.sh | 13 +++---------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 69593be..9f73be6 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,6 @@ List of Docker images |OS |Android |API |Browser |Browser version |Chromedriver |Image |Size | |:---|:---|:---|:---|:---|:---|:---|:---| -|Linux|5.0.1|21|browser|37.0|2.21|budtmo/docker-android-x86-5.0.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-5.0.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-5.0.1 "Get your own image badge on microbadger.com")| -|Linux|5.1.1|22|browser|39.0|2.13|budtmo/docker-android-x86-5.1.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-5.1.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-5.1.1 "Get your own image badge on microbadger.com")| |Linux|6.0|23|browser|44.0|2.18|budtmo/docker-android-x86-6.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-6.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-6.0 "Get your own image badge on microbadger.com")| |Linux|7.0|24|chrome|51.0|2.23|budtmo/docker-android-x86-7.0|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-7.0.svg)](https://microbadger.com/images/budtmo/docker-android-x86-7.0 "Get your own image badge on microbadger.com")| |Linux|7.1.1|25|chrome|55.0|2.28|budtmo/docker-android-x86-7.1.1|[![](https://images.microbadger.com/badges/image/budtmo/docker-android-x86-7.1.1.svg)](https://microbadger.com/images/budtmo/docker-android-x86-7.1.1 "Get your own image badge on microbadger.com")| diff --git a/pipelines/release-emulators.yml b/pipelines/release-emulators.yml index 198df28..3e8e070 100644 --- a/pipelines/release-emulators.yml +++ b/pipelines/release-emulators.yml @@ -10,10 +10,6 @@ jobs: strategy: maxParallel: 10 matrix: - 5.0.1: - android.version: '5.0.1' - 5.1.1: - android.version: '5.1.1' 6.0: android.version: '6.0' 7.0: diff --git a/release.sh b/release.sh index a783244..ebc57ac 100755 --- a/release.sh +++ b/release.sh @@ -10,7 +10,7 @@ else fi if [ -z "$2" ]; then - read -p "Android version (5.0.1|5.1.1|6.0|7.0|7.1.1|8.0|8.1|9.0|10.0|11.0|12.0|all): " ANDROID_VERSION + read -p "Android version (6.0|7.0|7.1.1|8.0|8.1|9.0|10.0|11.0|12.0|all): " ANDROID_VERSION else ANDROID_VERSION=$2 fi @@ -22,8 +22,6 @@ else fi declare -A list_of_levels=( - [5.0.1]=21 - [5.1.1]=22 [6.0]=23 [7.0]=24 [7.1.1]=25 @@ -38,8 +36,6 @@ declare -A list_of_levels=( # The version of the Chrome browser installed on the Android emulator needs to be known beforehand # in order to chose the proper version of chromedriver (see http://chromedriver.chromium.org/downloads) declare -A chromedriver_versions=( - [5.0.1]="2.21" - [5.1.1]="2.13" [6.0]="2.18" [7.0]="2.23" [7.1.1]="2.28" @@ -68,7 +64,7 @@ function get_android_versions() { # If version cannot be found in the list if [ -z "$versions" ]; then - echo "Android version \"$ANDROID_VERSION\" is not found in the list or not supported! Support only version 5.0.1, 5.1.1, 6.0, 7.0, 7.1.1, 8.0, 8.1, 9.0, 10.0, 11.0, 12.0" + echo "Android version \"$ANDROID_VERSION\" is not found in the list or not supported! Support only version 6.0, 7.0, 7.1.1, 8.0, 8.1, 9.0, 10.0, 11.0, 12.0" exit 1 fi @@ -146,10 +142,7 @@ function build() { level=${list_of_levels[$v]} # Find image type and default web browser - if [ "$v" == "5.0.1" ] || [ "$v" == "5.1.1" ]; then - IMG_TYPE=default - BROWSER=browser - elif [ "$v" == "6.0" ]; then + if [ "$v" == "6.0" ]; then # It is because there is no ARM EABI v7a System Image for 6.0 IMG_TYPE=google_apis BROWSER=browser