Skip to content

Commit

Permalink
Merge branch 'main' into maestro-utils/chore/kotlin_gradle_kts
Browse files Browse the repository at this point in the history
  • Loading branch information
bartekpacia committed Aug 28, 2024
2 parents 3c58392 + f1a71eb commit dfdd065
Show file tree
Hide file tree
Showing 114 changed files with 987 additions and 1,199 deletions.
9 changes: 4 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ body:
- type: markdown
attributes:
value: >
### Thank you for using Maestro
### Thank you for using Maestro!
Before creating a new issue, please first search the
[existing issues database] and make sure it hasn't been reported
before.
Before creating a new issue, please first search the [existing issues]
and make sure it hasn't been reported before.
If you are sure that you have found a bug that hasn't been reported yet,
Expand All @@ -20,7 +19,7 @@ body:
---
[existing issues database]: https://github.com/mobile-dev-inc/maestro
[existing issues]: https://github.com/mobile-dev-inc/maestro
- type: checkboxes
attributes:
label: Is there an existing issue for this?
Expand Down
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Suggest a feature
description: You want to share a new idea to improve Maestro.
body:
- type: markdown
attributes:
value: >
### Thank you for using Maestro!
We can't wait to hear your idea!
First though, please search the [existing issues] to see if an issue
already exists for the feature you need. Maybe someone already did the
job for you and you don't need to fill this template.
---
If you are sure that the feature you want to suggest hasn't been
requested before, or if our documentation doesn't have an answer to what
you're looking for, then fill out the template below. Please bear in
mind that duplicates and unsufficiently described feature requests will
be closed.
[existing issues]: https://github.com/mobile-dev-inc/maestro/issues
- type: textarea
attributes:
label: Use case
description: >
Please tell us more about the use case you have that led to you wanting
this new feature.
Is your feature request related to a problem? Please give a clear and
concise description of what the problem is. This will help avoid the
[XY problem].
Describe the alternative solutions you've considered and the tradeoffs
they come with. The more context you can provide, the better.
[XY problem]: https://en.wikipedia.org/wiki/XY_problem
validations:
required: true
- type: textarea
attributes:
label: Proposal
description: >
Briefly but precisely describe what the new feature should look like
from the user perspective.
Consider attaching something showing what you are imagining:
* code samples (maybe you already know )
* API design ideas (e.g. of new YAML commands)
validations:
required: true
- type: textarea
validations:
required: false
attributes:
label: Anything else?
description: >
Links? Other issues? StackOverflow threads? Anything that will give us
more context about this feature request will be helpful.
> [!TIP]
> You can attach images or other files by clicking this area to highlight it and then dragging files in.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
issue_comment:
types: [created]
schedule:
- cron: '0 * * * *'
- cron: '0 */6 * * *'

permissions:
issues: write
Expand All @@ -26,13 +26,16 @@ jobs:
Without additional information, we can't resolve this issue. We're
therefore reluctantly going to close it.
Feel free to open a new issue with all the required information
provided, including a [minimal, reproducible sample]. When creating
a new issue, please make sure to diligently fill out the issue
template.
Thank you for your contribution to our open-source community!
[minimal, reproducible sample]: https://stackoverflow.com/help/minimal-reproducible-example
# Number of days of inactivity before an issue is closed.
daysUntilClose: 14
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

on:
schedule:
- cron: '0 * * * *'
- cron: '0 */6 * * *'

jobs:
lock:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ jobs:
if: github.repository == 'mobile-dev-inc/maestro'

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Clone repository
uses: actions/checkout@v4

- name: Install JDK
uses: actions/setup-java@v3
- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8
distribution: zulu
java-version: 11

- uses: gradle/gradle-build-action@v2
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3

- name: Publish CLI
run: ./gradlew :maestro-cli:jreleaserFullRelease --no-daemon --no-parallel
Expand All @@ -27,4 +28,4 @@ jobs:

- name: Print jReleaser log
if: always()
run: cat maestro-cli/build/jreleaser/trace.log
run: cat maestro-cli/build/jreleaser/trace.log
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,26 @@ on:
- 'v*'

env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_ACCESS_TOKEN_USER }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_ACCESS_TOKEN_PASSWORD }}

jobs:
publish:
runs-on: ubuntu-latest
if: github.repository == 'mobile-dev-inc/maestro'

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Clone repository
uses: actions/checkout@v4

- name: Install JDK 8
uses: actions/setup-java@v3
- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8
distribution: zulu
java-version: 11

- uses: gradle/gradle-build-action@v2
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3

- name: Retrieve version
run: |
Expand Down Expand Up @@ -78,4 +79,4 @@ jobs:
if: ${{ !endsWith(env.VERSION_NAME, '-SNAPSHOT') }}
env:
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ jobs:
if: github.repository == 'mobile-dev-inc/maestro'

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Clone repository
uses: actions/checkout@v4

- name: Install JDK 8
uses: actions/setup-java@v3
- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8
distribution: zulu
java-version: 11

- uses: gradle/gradle-build-action@v2
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3

- name: Retrieve version
run: |
Expand Down
75 changes: 75 additions & 0 deletions .github/workflows/test-e2e-prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Test E2E (prod)

on:
workflow_dispatch:
schedule:
- cron: '0 * * * *'

jobs:
test-cloud-production:
# This job is copied from "e2e-production" in mobile-dev-inc/monorepo.
# We want it here so open-source users can also have some visibility into it.

runs-on: ubuntu-latest
if: github.repository == 'mobile-dev-inc/maestro'

steps:
- name: Clone repository
uses: actions/checkout@v4

- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 8

- name: Install Maestro
run: |
curl -Ls --retry 3 --retry-all-errors "https://get.maestro.mobile.dev" | bash
echo "${HOME}/.maestro/bin" >> $GITHUB_PATH
- name: Print Maestro version
run: maestro --version

- name: Download samples
run: maestro download-samples

- name: Run iOS test
run: |
maestro cloud \
--apiKey ${{ secrets.E2E_MOBILE_DEV_API_KEY }} \
--timeout 180 \
--fail-on-cancellation \
--include-tags=advanced \
samples/sample.zip samples
- name: Run Android test
run: |
maestro cloud \
--apiKey ${{ secrets.E2E_MOBILE_DEV_API_KEY }} \
--fail-on-cancellation \
--include-tags advanced \
samples/sample.apk samples
- name: Trigger alert on failure
if: ${{ false }}
# if: failure()
run: |
curl --request POST \
--url "https://events.pagerduty.com/v2/enqueue" \
--header 'Content-Type: application/json' \
--data '{
"payload": {
"summary": "E2E test failed",
"source": "E2E test",
"severity": "critical"
},
"routing_key": "${{ secrets.E2E_PAGER_DUTY_INTEGRATION_KEY }}",
"event_action": "trigger",
"links": [
{
"href": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
"text": "Failed E2E test - Github Action"
}
]
}'
Loading

0 comments on commit dfdd065

Please sign in to comment.