Skip to content

Commit

Permalink
Merge branch 'main' into test-automation
Browse files Browse the repository at this point in the history
  • Loading branch information
a-szotyori committed Jul 16, 2024
2 parents d2ffcb8 + f218e15 commit e66b5c5
Show file tree
Hide file tree
Showing 169 changed files with 1,295 additions and 9,635 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bank-api-library.check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: bank-api-library-instrumented-test-results
name: bank-api-library-instrumented-test-results-api-level-${{ matrix.api-level }}
path: bank-api-library/library/build/outputs/androidTest-results/connected

checkstyle:
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/bank-api-library.docs.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,6 @@ jobs:
with:
fetch-depth: 0

- name: get branch name
id: branch
shell: bash
run: |
# Get the branch ref that contains the tag in github.ref
# (github.ref contains the tag because this workflow is triggered by tags:
# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context)
branch_ref=$(git branch -r --contains "${{ github.ref }}")
# Remove "origin/" prefix from branch_ref and trim whitespace
branch_name=$(echo ${branch_ref/origin\/} | tr -d '[:space:]')
echo "::set-output name=branch_name::$branch_name"
echo "branch_name: $branch_name"
- name: setup java
uses: actions/setup-java@v3
with:
Expand All @@ -60,7 +47,6 @@ jobs:
"project_id": "bank-api-library",
"module_id": "library",
"documentation_title": "Gini Bank API Library for Android",
"is_stable_release": "${{ steps.branch.outputs.branch_name == 'main' }}",
"git_tag": "${{ github.ref }}",
"ci": "true",
"git_user": "${{ secrets.RELEASE_GITHUB_USER }}",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bank-api-library.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
options: >
{
"repo_url": "https://oss.sonatype.org/service/local/staging/deploy/maven2/",
"repo_user": "alpar.gini",
"repo_password": "${{ secrets.MAVEN_CENTRAL_PASSWORD }}",
"repo_user": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_USERNAME }}",
"repo_password": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_PASSWORD }}",
"project_id": "bank-api-library",
"module_id": "library",
"build_number": "${{ github.run_number }}",
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/bank-sdk.docs.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,6 @@ jobs:
with:
fetch-depth: 0

- name: get branch name
id: branch
shell: bash
run: |
# Get the branch ref that contains the tag in github.ref
# (github.ref contains the tag because this workflow is triggered by tags:
# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context)
branch_ref=$(git branch -r --contains "${{ github.ref }}")
# Remove "origin/" prefix from branch_ref and trim whitespace
branch_name=$(echo ${branch_ref/origin\/} | tr -d '[:space:]')
echo "::set-output name=branch_name::$branch_name"
echo "branch_name: $branch_name"
- name: setup java
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -61,7 +48,6 @@ jobs:
"project_id": "bank-sdk",
"module_id": "sdk",
"documentation_title": "Gini Bank SDK for Android",
"is_stable_release": "${{ steps.branch.outputs.branch_name == 'main' }}",
"links_to_projects": "[{\\\"project_id\\\": \\\"capture-sdk\\\", \\\"module_id\\\": \\\"sdk\\\"}]",
"git_tag": "${{ github.ref }}",
"ci": "true",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bank-sdk.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
options: >
{
"repo_url": "https://oss.sonatype.org/service/local/staging/deploy/maven2/",
"repo_user": "alpar.gini",
"repo_password": "${{ secrets.MAVEN_CENTRAL_PASSWORD }}",
"repo_user": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_USERNAME }}",
"repo_password": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_PASSWORD }}",
"project_id": "bank-sdk",
"module_id": "sdk",
"build_number": "${{ github.run_number }}",
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/capture-sdk.docs.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,6 @@ jobs:
with:
fetch-depth: 0

- name: get branch name
id: branch
shell: bash
run: |
# Get the branch ref that contains the tag in github.ref
# (github.ref contains the tag because this workflow is triggered by tags:
# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context)
branch_ref=$(git branch -r --contains "${{ github.ref }}")
# Remove "origin/" prefix from branch_ref and trim whitespace
branch_name=$(echo ${branch_ref/origin\/} | tr -d '[:space:]')
echo "::set-output name=branch_name::$branch_name"
echo "branch_name: $branch_name"
- name: setup java
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -61,7 +48,6 @@ jobs:
"project_id": "capture-sdk",
"module_id": "sdk",
"documentation_title": "Gini Capture SDK for Android",
"is_stable_release": "${{ steps.branch.outputs.branch_name == 'main' }}",
"git_tag": "${{ github.ref }}",
"ci": "true",
"git_user": "${{ secrets.RELEASE_GITHUB_USER }}",
Expand All @@ -83,7 +69,6 @@ jobs:
"project_id": "capture-sdk",
"module_id": "default-network",
"documentation_title": "Gini Capture SDK for Android",
"is_stable_release": "${{ steps.branch.outputs.branch_name == 'main' }}",
"git_tag": "${{ github.ref }}",
"ci": "true",
"git_user": "${{ secrets.RELEASE_GITHUB_USER }}",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/capture-sdk.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
options: >
{
"repo_url": "https://oss.sonatype.org/service/local/staging/deploy/maven2/",
"repo_user": "alpar.gini",
"repo_password": "${{ secrets.MAVEN_CENTRAL_PASSWORD }}",
"repo_user": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_USERNAME }}",
"repo_password": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_PASSWORD }}",
"project_id": "capture-sdk",
"module_id": "${{ matrix.module-id }}",
"build_number": "${{ github.run_number }}",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/core-api-library.check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: core-api-library-instrumented-test-results
name: core-api-library-instrumented-test-results-api-level-${{ matrix.api-level }}
path: core-api-library/library/build/outputs/androidTest-results/connected

checkstyle:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/core-api-library.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
options: >
{
"repo_url": "https://oss.sonatype.org/service/local/staging/deploy/maven2/",
"repo_user": "alpar.gini",
"repo_password": "${{ secrets.MAVEN_CENTRAL_PASSWORD }}",
"repo_user": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_USERNAME }}",
"repo_password": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_PASSWORD }}",
"project_id": "core-api-library",
"module_id": "library",
"build_number": "${{ github.run_number }}",
Expand Down
39 changes: 34 additions & 5 deletions .github/workflows/health-api-library.check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,34 @@ on:
secrets:
GINI_MOBILE_TEST_CLIENT_SECRET:
required: true
workflow_dispatch:
inputs:
clientId:
description: 'Client ID'
required: true
type: string
default: ''
clientSecret:
description: 'Client Secret'
required: true
type: string
default: ''
healthApiBaseUrl:
description: 'Health API Base URL'
required: true
type: string
default: ''
userCenterBaseUrl:
description: 'User Center Base URL'
required: true
type: string
default: ''
payApiBaseUrl:
description: 'Pay API Base URL'
required: true
type: string
default: ''


jobs:
test:
Expand Down Expand Up @@ -112,16 +140,17 @@ jobs:
script: >
adb uninstall net.gini.android.health.api.test ;
./gradlew health-api-library:library:connectedCheck
-PtestClientId="gini-mobile-test"
-PtestClientSecret="${{ secrets.GINI_MOBILE_TEST_CLIENT_SECRET }}"
-PtestApiUri="https://health-api.gini.net"
-PtestUserCenterUri="https://user.gini.net"
-PtestClientId="${{ inputs.clientId != '' && inputs.clientId || 'gini-mobile-test'}}"
-PtestClientSecret="${{ inputs.clientSecret != '' && inputs.clientSecret || secrets.GINI_MOBILE_TEST_CLIENT_SECRET }}"
-PtestApiUri="${{ inputs.healthApiBaseUrl != '' && inputs.healthApiBaseUrl || 'https://health-api.gini.net' }}"
-PtestUserCenterUri="${{ inputs.userCenterBaseUrl != '' && inputs.userCenterBaseUrl || 'https://user.gini.net' }}"
-PtestBankApiUri="${{ inputs.payApiBaseUrl != '' && inputs.payApiBaseUrl || 'https://pay-api.gini.net' }}"
- name: archive instrumented test results
if: always()
uses: actions/upload-artifact@v3
with:
name: health-api-library-instrumented-test-results
name: health-api-library-instrumented-test-results-api-level-${{ matrix.api-level }}
path: health-api-library/library/build/outputs/androidTest-results/connected

checkstyle:
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/health-api-library.docs.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,6 @@ jobs:
with:
fetch-depth: 0

- name: get branch name
id: branch
shell: bash
run: |
# Get the branch ref that contains the tag in github.ref
# (github.ref contains the tag because this workflow is triggered by tags:
# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context)
branch_ref=$(git branch -r --contains "${{ github.ref }}")
# Remove "origin/" prefix from branch_ref and trim whitespace
branch_name=$(echo ${branch_ref/origin\/} | tr -d '[:space:]')
echo "::set-output name=branch_name::$branch_name"
echo "branch_name: $branch_name"
- name: setup java
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -61,7 +48,6 @@ jobs:
"project_id": "health-api-library",
"module_id": "library",
"documentation_title": "Gini Health API Library for Android",
"is_stable_release": "${{ steps.branch.outputs.branch_name == 'main' }}",
"git_tag": "${{ github.ref }}",
"ci": "true",
"git_user": "${{ secrets.RELEASE_GITHUB_USER }}",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/health-api-library.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
options: >
{
"repo_url": "https://oss.sonatype.org/service/local/staging/deploy/maven2/",
"repo_user": "alpar.gini",
"repo_password": "${{ secrets.MAVEN_CENTRAL_PASSWORD }}",
"repo_user": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_USERNAME }}",
"repo_password": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_PASSWORD }}",
"project_id": "health-api-library",
"module_id": "library",
"build_number": "${{ github.run_number }}",
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/health-sdk.docs.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,6 @@ jobs:
with:
fetch-depth: 0

- name: get branch name
id: branch
shell: bash
run: |
# Get the branch ref that contains the tag in github.ref
# (github.ref contains the tag because this workflow is triggered by tags:
# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context)
branch_ref=$(git branch -r --contains "${{ github.ref }}")
# Remove "origin/" prefix from branch_ref and trim whitespace
branch_name=$(echo ${branch_ref/origin\/} | tr -d '[:space:]')
echo "::set-output name=branch_name::$branch_name"
echo "branch_name: $branch_name"
- name: setup java
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -61,7 +48,6 @@ jobs:
"project_id": "health-sdk",
"module_id": "sdk",
"documentation_title": "Gini Health SDK for Android",
"is_stable_release": "${{ steps.branch.outputs.branch_name == 'main' }}",
"git_tag": "${{ github.ref }}",
"ci": "true",
"git_user": "${{ secrets.RELEASE_GITHUB_USER }}",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/health-sdk.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
options: >
{
"repo_url": "https://oss.sonatype.org/service/local/staging/deploy/maven2/",
"repo_user": "alpar.gini",
"repo_password": "${{ secrets.MAVEN_CENTRAL_PASSWORD }}",
"repo_user": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_USERNAME }}",
"repo_password": "${{ secrets.MAVEN_CENTRAL_USER_TOKEN_PASSWORD }}",
"project_id": "health-sdk",
"module_id": "sdk",
"build_number": "${{ github.run_number }}",
Expand Down
Loading

0 comments on commit e66b5c5

Please sign in to comment.