Skip to content

Commit

Permalink
Merge pull request #73 from adorsys/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
drilonrecica authored Jan 23, 2020
2 parents c300ebf + 84ec39d commit a6345b6
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 5 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: SecureStorage Pull Request Workflow

on:
pull_request:
branches-ignore:
- 'gh-pages'

jobs:
assemble:
name: AssembleDebug SecureStorage
runs-on: macOS-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: AssembleDebug SecureStorage
run: bash ./gradlew assembleDebug --stacktrace

test:
needs: assemble
name: Test SecureStorage
runs-on: macOS-latest
strategy:
matrix:
api-level: [21, 22, 23, 25, 29]
target: [default]
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Test SecureStorage
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ matrix.api-level }}
target: ${{ matrix.target }}
arch: x86_64
profile: Nexus 6
script: ./gradlew connectedAndroidTest --stacktrace
20 changes: 20 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: SecureStorage Push Workflow

on:
push:
branches-ignore:
- 'gh-pages'

jobs:
assemble:
name: AssembleDebug SecureStorage
runs-on: macOS-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: AssembleDebug SecureStorage
run: bash ./gradlew assembleDebug --stacktrace
9 changes: 5 additions & 4 deletions .github/workflows/android.yml → .github/workflows/tag.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: SecureStorage Github Actions CI
name: SecureStorage Tag Workflow

on:
push:
branches-ignore:
- 'gh-pages'
branches:
- master
tags:
- '*'

jobs:
assemble:
Expand Down Expand Up @@ -46,7 +48,6 @@ jobs:
publish:
needs: [assemble, test]
name: Publish SecureStorage
if: github.ref == 'refs/heads/master'
runs-on: macOS-latest
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Storing Credentials Securely on Android Devices

[![Actions Status](https://github.com/adorsys/secure-storage-android/workflows/SecureStorage%20Github%20Actions%20CI/badge.svg)](https://github.com/adorsys/secure-storage-android/actions)
[![Actions Status](https://github.com/adorsys/secure-storage-android/workflows/SecureStorage%20Pull%20Request%20Workflow/badge.svg)](https://github.com/adorsys/secure-storage-android/actions)
[![Download](https://api.bintray.com/packages/andev/adorsys/securestoragelibrary/images/download.svg) ](https://bintray.com/andev/adorsys/securestoragelibrary/_latestVersion)
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Secure%20Storage%20Android-blue.svg?style=flat)](https://android-arsenal.com/details/1/5648)
[![API](https://img.shields.io/badge/API-18%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=18)
Expand Down

0 comments on commit a6345b6

Please sign in to comment.