Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mustafaozhan committed Mar 15, 2023
2 parents 1078e65 + 1130017 commit 21ef677
Show file tree
Hide file tree
Showing 89 changed files with 1,314 additions and 847 deletions.
74 changes: 36 additions & 38 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,38 @@ concurrency:
cancel-in-progress: true

env:
ANDROID_RELEASE_ADMOB_APP_ID: ${{ secrets.ANDROID_RELEASE_ADMOB_APP_ID }}
ANDROID_RELEASE_BANNER_AD_UNIT_ID_CALCULATOR: ${{ secrets.ANDROID_RELEASE_BANNER_AD_UNIT_ID_CALCULATOR }}
ANDROID_RELEASE_BANNER_AD_UNIT_ID_SETTINGS: ${{ secrets.ANDROID_RELEASE_BANNER_AD_UNIT_ID_SETTINGS }}
ANDROID_RELEASE_BANNER_AD_UNIT_ID_CURRENCIES: ${{ secrets.ANDROID_RELEASE_BANNER_AD_UNIT_ID_CURRENCIES }}
ANDROID_RELEASE_INTERSTITIAL_AD_ID: ${{ secrets.ANDROID_RELEASE_INTERSTITIAL_AD_ID }}
ANDROID_RELEASE_REWARDED_AD_UNIT_ID: ${{ secrets.ANDROID_RELEASE_REWARDED_AD_UNIT_ID }}
ANDROID_DEBUG_ADMOB_APP_ID: ${{ secrets.ANDROID_DEBUG_ADMOB_APP_ID }}
ANDROID_DEBUG_BANNER_AD_UNIT_ID_CALCULATOR: ${{ secrets.ANDROID_DEBUG_BANNER_AD_UNIT_ID_CALCULATOR }}
ANDROID_DEBUG_BANNER_AD_UNIT_ID_SETTINGS: ${{ secrets.ANDROID_DEBUG_BANNER_AD_UNIT_ID_SETTINGS }}
ANDROID_DEBUG_BANNER_AD_UNIT_ID_CURRENCIES: ${{ secrets.ANDROID_DEBUG_BANNER_AD_UNIT_ID_CURRENCIES }}
ANDROID_DEBUG_INTERSTITIAL_AD_ID: ${{ secrets.ANDROID_DEBUG_INTERSTITIAL_AD_ID }}
ANDROID_DEBUG_REWARDED_AD_UNIT_ID: ${{ secrets.ANDROID_DEBUG_REWARDED_AD_UNIT_ID }}
ANDROID_KEY_STORE_PATH: ${{ secrets.ANDROID_KEY_STORE_PATH }}
ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
BASE_URL_BACKEND: ${{ secrets.BASE_URL_BACKEND }}
BASE_URL_API: ${{ secrets.BASE_URL_API }}
BASE_URL_API_PREMIUM: ${{ secrets.BASE_URL_API_PREMIUM }}
API_KEY_PREMIUM: ${{ secrets.API_KEY_PREMIUM }}
ANDROID_KEY_STORE_PATH: ${{ secrets.ANDROID_KEY_STORE_PATH }}
ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
RELEASE_ADVERTISEMENT_ID_GOOGLE: ${{ secrets.RELEASE_ADVERTISEMENT_ID_GOOGLE }}
DEBUG_ADVERTISEMENT_ID_GOOGLE: ${{ secrets.DEBUG_ADVERTISEMENT_ID_GOOGLE }}
RELEASE_ADVERTISEMENT_ID_HUAWEI: ${{ secrets.RELEASE_ADVERTISEMENT_ID_HUAWEI }}
DEBUG_ADVERTISEMENT_ID_HUAWEI: ${{ secrets.DEBUG_ADVERTISEMENT_ID_HUAWEI }}
GOOGLE_BANNER_AD_UNIT_ID_CALCULATOR_RELEASE: ${{ secrets.GOOGLE_BANNER_AD_UNIT_ID_CALCULATOR_RELEASE }}
GOOGLE_BANNER_AD_UNIT_ID_SETTINGS_RELEASE: ${{ secrets.GOOGLE_BANNER_AD_UNIT_ID_SETTINGS_RELEASE }}
GOOGLE_BANNER_AD_UNIT_ID_CURRENCIES_RELEASE: ${{ secrets.GOOGLE_BANNER_AD_UNIT_ID_CURRENCIES_RELEASE }}
GOOGLE_INTERSTITIAL_AD_ID_RELEASE: ${{ secrets.GOOGLE_INTERSTITIAL_AD_ID_RELEASE }}
GOOGLE_REWARDED_AD_UNIT_ID_RELEASE: ${{ secrets.GOOGLE_REWARDED_AD_UNIT_ID_RELEASE }}
GOOGLE_BANNER_AD_UNIT_ID_CALCULATOR_DEBUG: ${{ secrets.GOOGLE_BANNER_AD_UNIT_ID_CALCULATOR_DEBUG }}
GOOGLE_BANNER_AD_UNIT_ID_SETTINGS_DEBUG: ${{ secrets.GOOGLE_BANNER_AD_UNIT_ID_SETTINGS_DEBUG }}
GOOGLE_BANNER_AD_UNIT_ID_CURRENCIES_DEBUG: ${{ secrets.GOOGLE_BANNER_AD_UNIT_ID_CURRENCIES_DEBUG }}
GOOGLE_INTERSTITIAL_AD_ID_DEBUG: ${{ secrets.GOOGLE_INTERSTITIAL_AD_ID_DEBUG }}
GOOGLE_REWARDED_AD_UNIT_ID_DEBUG: ${{ secrets.GOOGLE_REWARDED_AD_UNIT_ID_DEBUG }}
HUAWEI_BANNER_AD_UNIT_ID_CALCULATOR_RELEASE: ${{ secrets.HUAWEI_BANNER_AD_UNIT_ID_CALCULATOR_RELEASE }}
HUAWEI_BANNER_AD_UNIT_ID_SETTINGS_RELEASE: ${{ secrets.HUAWEI_BANNER_AD_UNIT_ID_SETTINGS_RELEASE }}
HUAWEI_BANNER_AD_UNIT_ID_CURRENCIES_RELEASE: ${{ secrets.HUAWEI_BANNER_AD_UNIT_ID_CURRENCIES_RELEASE }}
HUAWEI_INTERSTITIAL_AD_ID_RELEASE: ${{ secrets.HUAWEI_INTERSTITIAL_AD_ID_RELEASE }}
HUAWEI_REWARDED_AD_UNIT_ID_RELEASE: ${{ secrets.HUAWEI_REWARDED_AD_UNIT_ID_RELEASE }}
HUAWEI_BANNER_AD_UNIT_ID_CALCULATOR_DEBUG: ${{ secrets.HUAWEI_BANNER_AD_UNIT_ID_CALCULATOR_DEBUG }}
HUAWEI_BANNER_AD_UNIT_ID_SETTINGS_DEBUG: ${{ secrets.HUAWEI_BANNER_AD_UNIT_ID_SETTINGS_DEBUG }}
HUAWEI_BANNER_AD_UNIT_ID_CURRENCIES_DEBUG: ${{ secrets.HUAWEI_BANNER_AD_UNIT_ID_CURRENCIES_DEBUG }}
HUAWEI_INTERSTITIAL_AD_ID_DEBUG: ${{ secrets.HUAWEI_INTERSTITIAL_AD_ID_DEBUG }}
HUAWEI_REWARDED_AD_UNIT_ID_DEBUG: ${{ secrets.HUAWEI_REWARDED_AD_UNIT_ID_DEBUG }}
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
APP_STORE_CONNECT_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_KEY_CONTENT }}
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
Expand All @@ -39,6 +51,7 @@ env:
GIT_AUTHORIZATION: ${{ secrets.GIT_AUTHORIZATION }}
SECRET_PASSWORD: ${{ secrets.SECRET_PASSWORD }}
MATCH_PASSWORD: ${{ secrets.SECRET_PASSWORD }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 5
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 5
CI: true
Expand All @@ -51,7 +64,7 @@ jobs:
status: ${{ steps.status.outputs.status }}
steps:

- name: Clone Repo # needed for app version
- name: Clone Repo
uses: actions/checkout@v3
with:
submodules: 'recursive'
Expand Down Expand Up @@ -105,13 +118,8 @@ jobs:
outputs:
status: ${{ steps.status.outputs.status }}
steps:
- name: Clone Repo # needed for app version
uses: actions/checkout@v3
with:
submodules: 'recursive'
fetch-depth: 0

- name: Download Google APK
- name: Download Android Artifacts
uses: actions/download-artifact@v3
with:
name: androidArtifacts
Expand All @@ -132,7 +140,7 @@ jobs:
groups: QA
file: huawei/release/app-huawei-release.apk

- name: Delete Google APK
- name: Delete Android Artifacts
uses: geekyeggo/delete-artifact@v2
with:
name: androidArtifacts
Expand Down Expand Up @@ -214,11 +222,8 @@ jobs:
outputs:
status: ${{ steps.status.outputs.status }}
steps:
- name: Clone Repo # needed for app version
- name: Clone Repo
uses: actions/checkout@v3
with:
submodules: 'recursive'
fetch-depth: 0

- name: Download iOS IPA
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -246,11 +251,10 @@ jobs:
status: ${{ steps.status.outputs.status }}
steps:

- name: Clone Repo # needed for app version
- name: Clone Repo
uses: actions/checkout@v3
with:
submodules: 'recursive'
fetch-depth: 0

- name: Set up JDK 11
uses: actions/setup-java@v3
Expand Down Expand Up @@ -283,11 +287,8 @@ jobs:
outputs:
status: ${{ steps.status.outputs.status }}
steps:
- name: Clone Repo # needed for app version
- name: Clone Repo # Codecov requires it
uses: actions/checkout@v3
with:
submodules: 'recursive'
fetch-depth: 0

- name: Download Coverage Report
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -333,11 +334,10 @@ jobs:
status: ${{ steps.status.outputs.status }}
steps:

- name: Clone Repo # needed for app version
- name: Clone Repo
uses: actions/checkout@v3
with:
submodules: 'recursive'
fetch-depth: 0

- name: Set up JDK 11
uses: actions/setup-java@v3
Expand Down Expand Up @@ -375,8 +375,6 @@ jobs:
false == (needs.UploadQualityReports.outputs.status == 'success') ||
(false == (needs.DistributeAndroid.outputs.status == 'success') && github.event_name == 'push') ||
(false == (needs.DistributeIOS.outputs.status == 'success') && github.event_name == 'push')
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: voxmedia/github-action-slack-notify-build@v2
with:
channel: ccc-github
Expand Down
48 changes: 45 additions & 3 deletions .github/workflows/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,59 @@ on:
issues:
types:
- opened
- reopened
pull_request:
types:
- opened
- ready_for_review
- reopened
- closed
- converted_to_draft

jobs:
ProjectAutomations:
runs-on: ubuntu-latest
steps:
- name: 'Add issue to project'
if: github.event_name == 'issues' && github.event.action == 'opened'
uses: leonsteinhaeuser/project-beta-automations@v2.0.1
if: github.event_name == 'issues' && (github.event.action == 'opened' || github.event.action == 'reopened')
uses: leonsteinhaeuser/project-beta-automations@v2.1.0
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
project_id: 2
resource_node_id: ${{ github.event.issue.node_id }}
custom_field_values: ${{ secrets.CUSTOM_FIELD_VALUES }}
operation_mode: custom_field
custom_field_values: '[{\"name\": \"Iteration\",\"type\": \"iteration\",\"value\": \"@current\"}]'

- name: 'Move Related Issue to "🏗 PR Review"'
if: github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'ready_for_review' || github.event.action == 'reopened')
uses: leonsteinhaeuser/[email protected]
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
project_id: 2
resource_node_id: ${{ github.event.pull_request.node_id }}
status_value: "🏗 PR Review"
move_related_issues: true

- name: 'Move Related Issue to "🚧 In Progress"'
if: github.event_name == 'pull_request' && github.event.action == 'converted_to_draft'
uses: leonsteinhaeuser/[email protected]
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
project_id: 2
resource_node_id: ${{ github.event.pull_request.node_id }}
status_value: "🚧 In Progress"
move_related_issues: true

- name: 'Move Related Issue to "✅ Done"'
if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
uses: leonsteinhaeuser/[email protected]
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: Oztechan
project_id: 2
resource_node_id: ${{ github.event.pull_request.node_id }}
status_value: "✅ Done"
move_related_issues: true
39 changes: 39 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Publish Release

on:
push:
tags:
- "v*"

jobs:

PublishRelease:
runs-on: ubuntu-latest
outputs:
status: ${{ steps.status.outputs.status }}
steps:

- name: PublishRelease
uses: marvinpinto/[email protected]
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}

- name: Set Job Status
id: status
run: echo "::set-output name=status::success"

Notify:
runs-on: ubuntu-latest
needs: [ PublishRelease ]
if: always()
steps:

- name: Notify slack fail
if: false == (needs.PublishRelease.outputs.status == 'success')
uses: voxmedia/github-action-slack-notify-build@v2
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
with:
channel: ccc-github
status: FAILED
color: danger
Loading

0 comments on commit 21ef677

Please sign in to comment.