Merge pull request #67 from faberNovel/release/v1.1.1

Prepare release v1.1.1

.github/workflows/cd_prepare_release.yml

@@ -75,3 +75,4 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           destination_branch: "master"
+          pr_title: "Prepare release ${{ needs.job_compute_release_name.outputs.release_name }}"

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [v1.1.1](https://github.com/faberNovel/docker-android/tree/v1.1.1) (2020-05-15)
+
+[Full Changelog](https://github.com/faberNovel/docker-android/compare/v1.1.0...v1.1.1)
+
+**Closed issues:**
+
+- Add python description to image description [\#63](https://github.com/faberNovel/docker-android/issues/63)
+- Documentation is outdated [\#62](https://github.com/faberNovel/docker-android/issues/62)
+- Clean image description markdown [\#60](https://github.com/faberNovel/docker-android/issues/60)
+
+**Merged pull requests:**
+
+- Cleanup desc script formatting [\#65](https://github.com/faberNovel/docker-android/pull/65) ([sjcqs](https://github.com/sjcqs))
+- Update script usage documentation [\#64](https://github.com/faberNovel/docker-android/pull/64) ([vincentbrison](https://github.com/vincentbrison))
+
 ## [v1.1.0](https://github.com/faberNovel/docker-android/tree/v1.1.0) (2020-05-13)
 
 [Full Changelog](https://github.com/faberNovel/docker-android/compare/v1.0.0...v1.1.0)
@@ -21,6 +36,7 @@
 
 **Merged pull requests:**
 
+- Add action branding [\#59](https://github.com/faberNovel/docker-android/pull/59) ([github-actions[bot]](https://github.com/apps/github-actions))
 - Feature/prepare action release [\#57](https://github.com/faberNovel/docker-android/pull/57) ([vincentbrison](https://github.com/vincentbrison))
 - Document Github Action [\#56](https://github.com/faberNovel/docker-android/pull/56) ([sjcqs](https://github.com/sjcqs))
 - Feature/update release flow [\#54](https://github.com/faberNovel/docker-android/pull/54) ([vincentbrison](https://github.com/vincentbrison))

README.md

@@ -34,25 +34,25 @@ on:
       - develop
 
 jobs:
-  build_test_and_deploy:
+  my_android_job:
     runs-on: ubuntu-18.04 # Works also with self hosted runner supporting docker
     container:
-      image: docker://fabernovel/android:api-29-v1.0.0
+      image: docker://fabernovel/android:api-29-v1.1.0
 
   steps:
     - name: Checkout
       uses: actions/[email protected]
 
     - name: Ruby cache
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v1.2.0
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
         restore-keys: |
           ${{ runner.os }}-gems-
 
     - name: Gradle cache
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v1.2.0
       with:
         path: /root/.gradle
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -67,8 +67,6 @@ jobs:
     - name: Fastlane
       run: bundle exec fastlane my_lane
 
-    - name: Cache workaround # https://github.com/actions/cache/issues/133
-      run: chmod -R a+rwx .
 ```
 You can also use the provided Github Action.
 However, caching won't work and you can expect longer build times.
@@ -82,20 +80,17 @@ on:
       - develop
 
 jobs:
-  build_test_and_deploy:
+  my_android_job:
     runs-on: ubuntu-18.04 # Works also with self hosted runner supporting docker
-    container:
-        image: docker://docker:stable-git
 
   steps:
     - name: Checkout
       uses: actions/[email protected]
 
-    - name: Test action
+    - name: Exec fastlane
       uses: fabernovel/docker-android
-      id: docker-android-action
       with:
-        docker-android-tag: api-29-ndk-v1.0.0
+        docker-android-tag: api-29-ndk-v1.1.0
         exec: |
           bundle install;
           bundle exec fastlane my_lane
@@ -132,7 +127,9 @@ usage: ./ci_cd.sh [--android-api 29] [--build] [--test]
   --ndk-version <version>        Install a specific Android NDK version from `sdkmanager --list`
   --build                        Build image
   --test                         Test image
+  --large-test                   Run large tests on the image (Firebase Test Lab for example)
   --deploy                       Deploy image
+  --desc                         Generate a .md file in /desc/ouput folder describing the builded image, on host machine
 ```
 
 ## License

ci_cd.sh

@@ -17,7 +17,7 @@ usage () {
   echo "  --test                         Test image"
   echo "  --large-test                   Run large tests on the image (Firebase Test Lab for example)"
   echo "  --deploy                       Deploy image"
-  echo "  --desc                         Generate a desc.txt file describing the builded image, on host machine"
+  echo "  --desc                         Generate a .md file in /desc/ouput folder describing the builded image, on host machine"
   exit 1
 }
 

desc/desc.sh

@@ -1,24 +1,54 @@
 #!/bin/sh
 echo "## Image environment"
-cat /etc/*-release
+grep "DISTRIB_DESCRIPTION=.*$" /etc/*-release | # extract only distrib description
+    cut -d= -f2 # get distrib description value only
+
 echo
 echo "## Android environment"
 echo "### Android SDKs"
 sdkmanager --list --sdk_root=$ANDROID_HOME |
     awk '/Installed packages:/{flag=1; next} /Available Packages/{flag=0} flag'
 echo "### Google Cloud SDK"
-gcloud --version
-echo
+echo "| Name | Version |"
+echo "|------|---------|"
+gcloud --version | while read -r lib; do
+    version=$(echo "${lib}" | awk '{ print $NF }')
+    name=$(echo $lib | awk '{$NF=""; print $0}')
+    echo "| $name | $version |"
+done
 
-echo "## APT packages"
-dpkg -l
-echo
+echo "## Python environment"
+echo "### Python version"
+python3 --version | cut -d' ' -f2-
+echo "### PIP version"
+pip3 --version | cut -d' ' -f2-
+echo "### Installed PIP packages"
+echo "| Name | Version |"
+echo "|------|---------|"
+pip3 freeze | while read -r lib; do
+    version=$(echo "$lib" | awk -F'=='  '{print $2}')
+    name=$(echo "$lib" | awk -F'=='  '{print $1}')
+    echo "| $name | $version |"
+done
 
 echo "## Ruby environment"
 echo "### Default ruby version"
-ruby -v
+ruby --version | cut -d' ' -f2-
 echo "### rbenv"
-rbenv -v
+rbenv --version | cut -d' ' -f2-
 echo "### Installed gems:"
-gem list
+echo "| Name | Version |"
+echo "|------|---------|"
+gem list | while read -r lib; do
+    version=$(echo $lib | awk -F"[()]" '{print $2}')
+    name=$(echo $lib | awk -F"[()]" '{print $1}')
+    echo "| $name | $version |"
+done
 echo
+
+echo "## APT packages"
+echo "| Name | Version | Architecture | Description |"
+echo "| ---- | ------- | ------------ | ----------- |"
+dpkg_format='| ${binary:Package} | ${Version} | ${Architecture} | ${binary:Summary} |\n'
+dpkg-query --show --showformat="$dpkg_format"
+done