diff --git a/.github/workflows/push-triggers.yml b/.github/workflows/push-triggers.yml index 98ee813c5a..6562b5aa86 100644 --- a/.github/workflows/push-triggers.yml +++ b/.github/workflows/push-triggers.yml @@ -6,7 +6,8 @@ on: - main - develop - qa-develop - - "release-**" + - inji-reusable-workflow + - 'release-**' release: types: [published] pull_request: @@ -15,7 +16,8 @@ on: - main - develop - qa-develop - - "release-**" + - inji-reusable-workflow + - 'release-**' jobs: build-android: @@ -24,15 +26,15 @@ jobs: NODE_VERSION: "16.x" DEBUG_KEYSTORE_ALIAS: androiddebugkey secrets: - DEBUG_KEYSTORE_PASSWORD: '${{secrets.INJI_ANDROID_DEBUG_STOREPASS}}' + DEBUG_KEYSTORE_PASSWORD: '${{ secrets.INJI_ANDROID_DEBUG_STOREPASS }}' build-ios: uses: tw-mosip/kattu/.github/workflows/ios-build.yml@add-inji-workflows with: - NODE_VERSION: "16.x" + NODE_VERSION: "18.x" sonar-check: - if: ${{ github.event_name == 'push' }} + if: ${{ github.event_name != 'pull_request' }} uses: tw-mosip/kattu/.github/workflows/sonar.yml@add-inji-workflows secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.talismanrc b/.talismanrc index d3e40ff5b8..0468a6bae9 100644 --- a/.talismanrc +++ b/.talismanrc @@ -36,4 +36,6 @@ fileignoreconfig: - filename: .github/workflows/push-triggers.yml checksum: 4c63a5c142288337f6fad670957005d932a139b95705cc5ec3e55dc63295146d - filename: .github/workflows/internal-build.yml - checksum: 9534127d1d01294985bb49e249fe83fd565e1f89c4ca04a60c26c9842274b263 \ No newline at end of file + checksum: 9534127d1d01294985bb49e249fe83fd565e1f89c4ca04a60c26c9842274b263 +- filename: android/fastlane/Fastfile + checksum: 16c5147be4ae327d63d580b174be0d6f83f1d4bb915f2b62856016331a082463 \ No newline at end of file diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index c11272645f..498b5fbf16 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -4,7 +4,9 @@ MIMOTO_HOST = ENV["MIMOTO_HOST"] ESIGNET_HOST = ENV["ESIGNET_HOST"] APPLICATION_THEME = ENV["APPLICATION_THEME"] RELEASE_KEYSTORE_ALIAS = ENV["RELEASE_KEYSTORE_ALIAS"] +DEBUG_KEYSTORE_ALIAS = ENV["DEBUG_KEYSTORE_ALIAS"] RELEASE_KEYSTORE_PASSWORD = ENV["RELEASE_KEYSTORE_PASSWORD"] +DEBUG_KEYSTORE_PASSWORD = ENV["DEBUG_KEYSTORE_PASSWORD"] PLAY_CONSOLE_RELEASE_DESCRIPTION = ENV["PLAY_CONSOLE_RELEASE_DESCRIPTION"] SLACK_URL = ENV["SLACK_URL"] CREDENTIAL_REGISTRY_EDIT = ENV["CREDENTIAL_REGISTRY_EDIT"] @@ -53,8 +55,6 @@ end desc "Deploy an Beta version to the Google Play" lane :android_build_beta do - gradle(task: "assembleBetaDebug") - git_tag = sh('git describe --abbrev=0 --tags --exact-match HEAD').strip def convert_tag_to_code(version)