Skip to content

Commit

Permalink
Merge pull request #109 from faberNovel/release/v1.6.0
Browse files Browse the repository at this point in the history
Prepare release v1.6.0
  • Loading branch information
flolom authored May 6, 2022
2 parents b71fead + c863fee commit e301c38
Show file tree
Hide file tree
Showing 25 changed files with 9,222 additions and 21 deletions.
7 changes: 4 additions & 3 deletions .ci/images_matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
"android_api": [
{
"api": 28,
"build_tools": "30.0.3"
"build_tools": "28.0.3"
},
{
"api": 29,
"build_tools": "30.0.3"
"build_tools": "29.0.3"
},
{
"api": 30,
"build_tools": "30.0.3"
},
{
"api": 31,
"build_tools": "32.0.0"
"build_tools": "30.0.3",
"__comment": "build-tools 31 are corrupted. Use 30.0.3 instead"
},
{
"api": 32,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd_prepare_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
path: images_description

- name: Commit changes
uses: actions-x/commit@v1
uses: actions-x/commit@v6
with:
message: Add changelog and images description

Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## [v1.6.0](https://github.com/faberNovel/docker-android/tree/v1.6.0) (2022-05-06)

[Full Changelog](https://github.com/faberNovel/docker-android/compare/v1.5.0...v1.6.0)

**Merged pull requests:**

- Bump actionx/commit version [\#108](https://github.com/faberNovel/docker-android/pull/108) ([flolom](https://github.com/flolom))
- Setup minimal SSH configuration for Github [\#107](https://github.com/faberNovel/docker-android/pull/107) ([nicolasygrand](https://github.com/nicolasygrand))
- Update gradle cache readme / Fix build tools [\#106](https://github.com/faberNovel/docker-android/pull/106) ([flolom](https://github.com/flolom))
- Add setup-ruby support [\#105](https://github.com/faberNovel/docker-android/pull/105) ([flolom](https://github.com/flolom))

## [v1.5.0](https://github.com/faberNovel/docker-android/tree/v1.5.0) (2022-03-14)

[Full Changelog](https://github.com/faberNovel/docker-android/compare/v1.4.1...v1.5.0)
Expand Down Expand Up @@ -143,6 +154,7 @@

- Move to latest Ubuntu LTS [\#44](https://github.com/faberNovel/docker-android/pull/44) ([vincentbrison](https://github.com/vincentbrison))
- Feature/prepare documentation for public release [\#43](https://github.com/faberNovel/docker-android/pull/43) ([vincentbrison](https://github.com/vincentbrison))
- Fix daily runner [\#31](https://github.com/faberNovel/docker-android/pull/31) ([sjcqs](https://github.com/sjcqs))

## [v1.0.0-alpha04](https://github.com/faberNovel/docker-android/tree/v1.0.0-alpha04) (2020-04-30)

Expand Down Expand Up @@ -173,7 +185,6 @@
- Fix large tests environment variables declaration [\#38](https://github.com/faberNovel/docker-android/pull/38) ([sjcqs](https://github.com/sjcqs))
- Feature/update release cd [\#37](https://github.com/faberNovel/docker-android/pull/37) ([vincentbrison](https://github.com/vincentbrison))
- Create PR on push on releases branch [\#35](https://github.com/faberNovel/docker-android/pull/35) ([vincentbrison](https://github.com/vincentbrison))
- Fix daily runner [\#31](https://github.com/faberNovel/docker-android/pull/31) ([sjcqs](https://github.com/sjcqs))
- Feature/image description [\#30](https://github.com/faberNovel/docker-android/pull/30) ([vincentbrison](https://github.com/vincentbrison))
- Test Firebase Test Lab Integration [\#28](https://github.com/faberNovel/docker-android/pull/28) ([sjcqs](https://github.com/sjcqs))
- Install google cloud sdk [\#25](https://github.com/faberNovel/docker-android/pull/25) ([sjcqs](https://github.com/sjcqs))
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
ssh \
# Fastlane plugins dependencies
# - fastlane-plugin-badge (curb)
libcurl4 libcurl4-openssl-dev
libcurl4 libcurl4-openssl-dev \
# ruby-setup dependencies
libyaml-0-2 \
libgmp-dev

## Clean dependencies
RUN apt-get clean
Expand Down
26 changes: 11 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,22 @@ jobs:
- name: Checkout
uses: actions/[email protected]

- name: Ruby cache
uses: actions/cache@v1.2.0
- name: Ruby Setup
uses: ruby/setup-ruby@v1
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gems-
bundler-cache: true
env:
ImageOS: ubuntu20

- name: Gradle cache
uses: actions/cache@v1.2.0
uses: actions/cache@v3
with:
path: /root/.gradle
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
path: |
/root/.gradle/caches
/root/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle
- name: Bundle install
run: |
bundle config path vendor/bundle
bundle check || bundle install
${{ runner.os }}-gradle-
- name: Fastlane
run: bundle exec fastlane my_lane
Expand Down
Loading

0 comments on commit e301c38

Please sign in to comment.