Skip to content

Commit

Permalink
Merge pull request #6 from Genymobile/feature/recipe_uuid_not_more_ma…
Browse files Browse the repository at this point in the history
…ndatory

Feature/recipe UUID not more mandatory
  • Loading branch information
thomascarpentier authored Jun 7, 2023
2 parents 28d881c + 2819afb commit 2aef5c0
Show file tree
Hide file tree
Showing 13 changed files with 7,939 additions and 2,822 deletions.
70 changes: 49 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ jobs:
name: With Adb Serial Port
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: "3.9.1"
architecture: "x64"
python-version: "3.10.11"

- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 1.8
java-version: "17"
distribution: "temurin"

- name: Setup Android SDK
uses: android-actions/setup-android@v2
Expand All @@ -55,17 +55,17 @@ jobs:
name: Start Several devices
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: "3.9.1"
architecture: "x64"
python-version: "3.10.11"

- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 1.8
java-version: "17"
distribution: "temurin"

- name: Setup Android SDK
uses: android-actions/setup-android@v2
Expand All @@ -87,17 +87,17 @@ jobs:
name: Use a specific gmsaas version
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: "3.9.1"
architecture: "x64"
python-version: "3.10.11"

- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 1.8
java-version: "17"
distribution: "temurin"

- name: Setup Android SDK
uses: android-actions/setup-android@v2
Expand All @@ -109,3 +109,31 @@ jobs:
email: ${{ secrets.GMSAAS_EMAIL }}
password: ${{ secrets.GMSAAS_PASSWORD }}
recipe_uuid: ${{ matrix.recipe_uuid }}


test-integration-install_configure_gmsaas:
runs-on: ubuntu-latest

name: Only install and configure gmsaas
steps:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/setup-python@v4
with:
python-version: "3.10.11"

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: "17"
distribution: "temurin"

- name: Setup Android SDK
uses: android-actions/setup-android@v2

- name: Genymotion
uses: ./
with:
email: ${{ secrets.GMSAAS_EMAIL }}
password: ${{ secrets.GMSAAS_PASSWORD }}
47 changes: 22 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ that credentials keys should be stored as [GitHub secrets](https://docs.github.c
- `password` {string} {required} The password of your Genymotion Cloud SaaS account. `GMSAAS_PASSWORD` should be stored as a [GitHub secret](https://docs.github.com/en/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-organization) and passed as in the
example below. **Never** store your `GMSAAS_PASSWORD` as plain text in your YAML workflow.
- `gmsaas_version` {string} {optional} Install a specific version of gmsaas (not recommended). Defaults to the latest version if not specified.
- `recipe_uuid` {string} {required} Recipe UUID is the identifier used when starting an instance; it can be retrieved using `gmsaas recipes list`,
- `recipe_uuid` {string} {optional} Recipe UUID is the identifier used when starting an instance; it can be retrieved using `gmsaas recipes list`,
or check [availables recipes](https://support.genymotion.com/hc/en-us/articles/360007473658-Supported-Android-devices-templates-for-Genymotion-Cloud-SaaS) for a comprehensive list of all currently available recipes.
- `adb_serial_port` {string} {optional} port which the instance will be connected to ADB. Defaults to None

Expand All @@ -38,18 +38,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: "3.9.1"
architecture: "x64"
python-version: "3.10.11"
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 1.8
java-version: "17"
distribution: "temurin"
- name: Setup Android SDK
uses: android-actions/setup-android@v2
Expand Down Expand Up @@ -80,18 +79,17 @@ jobs:
- 4c015ada-e64e-4f5d-a320-06cbf6e95648 # android 10
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: "3.9.1"
architecture: "x64"
python-version: "3.10.11"
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 1.8
java-version: "17"
distribution: "temurin"
- name: Setup Android SDK
uses: android-actions/setup-android@v2
Expand All @@ -117,18 +115,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: "3.9.1"
architecture: "x64"
python-version: "3.10.11"
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 1.8
java-version: "17"
distribution: "temurin"
- name: Setup Android SDK
uses: android-actions/setup-android@v2
Expand Down
3 changes: 1 addition & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ inputs:
Instance recipe to use. Recipes can be listed with command line `gmsaas recipes list`,
or check https://support.genymotion.com/hc/en-us/articles/360007473658-Supported-Android-devices-templates-for-Genymotion-Cloud-SaaS
for a comprehensive list of all currently available recipes.
required: true
adb_serial_port:
description: |-
If `adb_serial_port` option is set,
Expand All @@ -42,4 +41,4 @@ runs:

branding:
icon: 'cloud'
color: 'red'
color: 'red'
Loading

0 comments on commit 2aef5c0

Please sign in to comment.