Skip to content
This repository has been archived by the owner on Mar 31, 2022. It is now read-only.

SDK tools, Platform Tools and Emulator versions added to system_report.sh #96

Merged
merged 2 commits into from
Jul 14, 2017
Merged

SDK tools, Platform Tools and Emulator versions added to system_report.sh #96

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
657263a
SDK tools, Platform Tools and Emulator versions added to `system_repo…
koral-- Jul 12, 2017
09b2f1c
emulator installation added to Dockerfile
koral-- Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## `v2017_07_13_1`

* SDK tools, Platform Tools and Emulator versions added to `system_report.sh` : https://github.com/bitrise-docker/android/pull/96

## `v2017_07_12_1`

* SDK tools updated to 26.0.2 : https://github.com/bitrise-docker/android/pull/95
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,5 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${ANDROID_HOME}/tools/lib64
# Cleaning
RUN apt-get clean

ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2017_06_10_1
ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2017_07_13_1
CMD bitrise -version
10 changes: 10 additions & 0 deletions system_report.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@ which adb
echo
echo " * adb version:"
adb version
echo
echo " * SDK packages:"
if [[ ! -z "${BITRISE_DOCKER_REV_NUMBER_ANDROID_NDK_LTS}" ]] ; then
echo " (!) Version check not available on this Stack / in this image"
else
ver_line="$(grep ^Pkg.Revision ${ANDROID_HOME}/tools/source.properties | cut -d= -f 2)" ; echo "* SDK Tools version: $ver_line"
ver_line="$(grep ^Pkg.Revision ${ANDROID_HOME}/platform-tools/source.properties | cut -d= -f 2)" ; echo "* Platform Tools version: $ver_line"
ver_line="$(grep ^Pkg.Revision ${ANDROID_HOME}/emulator/source.properties | cut -d= -f 2)" ; echo "* Emulator version: $ver_line"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the PR check for this line:

grep: /opt/android-sdk-linux/emulator/source.properties: No such file or directory
* Emulator version:

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if possible please also make this line fail (non 0 exit code) in case of an error

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, will do.
It seems that emulator is no longer preinstalled with tools and needs to be installed explicitly by sdkmanager in Dockerfile.

fi

echo "========================================"
echo

Expand Down