Skip to content

Commit

Permalink
Revert "feat(MOSIP-29236): Add reusable workflows (#969)"
Browse files Browse the repository at this point in the history
This reverts commit c4b81a7.
  • Loading branch information
adityankannan-tw committed Oct 30, 2023
1 parent f41959b commit 5787f93
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 197 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android-build-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
- name: Run Build using Fastlane
run: |
cd android/scripts
./android-build.sh
./verify-build.sh
env:
DEBUG_KEYSTORE_ALIAS: androiddebugkey
DEBUG_KEYSTORE_PASSWORD: ${{secrets.INJI_ANDROID_DEBUG_STOREPASS || env.DUMMY_INJI_ANDROID_DEBUG_STOREPASS }}
137 changes: 0 additions & 137 deletions .github/workflows/internal-build.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ios-build-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Building the IPA
run: |
cd ios
fastlane build_app
fastlane build_app_for_automation_on_simulator
env:
APP_STORE_CONNECT_TEAM_ID: '${{ secrets.APP_STORE_CONNECT_TEAM_ID }}'
DEVELOPER_APP_ID: '${{ secrets.IOS_INJI_DEVELOPER_APP_ID }}'
Expand Down
41 changes: 0 additions & 41 deletions .github/workflows/push-triggers.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .talismanrc
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,3 @@ fileignoreconfig:
checksum: 6d22bc5c77398316b943c512c208ce0846a9fff674c1ccac79e07f21962acd5f
- filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
checksum: 10889302ca05646a283386be1bbe7a5fb510c02bb62a308ee45f3c2a872ae64e
- filename: .github/workflows/internal-build.yml
checksum: 3a3b4dea51cb496729c4e568113fc19cf5b008481bb4a5d157f211a2128b951b
- filename: .github/workflows/push-triggers.yml
checksum: c5de3d912e2cbd55f6898e2f4a24413abbee8f084c99ea11ce6265504a520ce0
- filename: android/fastlane/Fastfile
checksum: 41d1409adf8df9c843fd2dba89142cd55c471f3060ced57d48ee96dc8793ffcd
9 changes: 4 additions & 5 deletions android/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@ 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"]

desc "Verify Build for Android"
lane :android_build do
gradle(task: "assembleMosipDebug")
lane :android_build_verify do
gradle(
task: "assembleMosipDebug",
)
end

desc "Deploy an Internal testing version to the Google Play"
lane :android_build_internal do

previous_build_number = google_play_track_version_codes(
package_name: "io.mosip.residentapp",
track: "internal",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ yes | sudo gem install bundler

yes | sudo fastlane install_plugins

bundle exec fastlane android_build
bundle exec fastlane android_build_verify
41 changes: 36 additions & 5 deletions ios/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT = "120"
TESTFLIGHT_INTERNAL_TESTERS_GROUP = ENV["TESTFLIGHT_INTERNAL_TESTERS_GROUP"]
TESTFLIGHT_BETA_APP_DESCRIPTION = ENV["TESTFLIGHT_BETA_APP_DESCRIPTION"]
DEVELOPER_APP_ID = ENV["DEVELOPER_APP_ID"]
MIMOTO_HOST = ENV["MIMOTO_HOST"]
ESIGNET_HOST = ENV["ESIGNET_HOST"]
APPLICATION_THEME = ENV["APPLICATION_THEME"]
CREDENTIAL_REGISTRY_EDIT = ENV["CREDENTIAL_REGISTRY_EDIT"]

def delete_temp_keychain(name)
delete_keychain(
Expand Down Expand Up @@ -127,7 +123,42 @@ platform :ios do
)
end

lane :build_app do
lane :build_verify do
keychain_name = TEMP_KEYCHAIN_USER
keychain_password = TEMP_KEYCHAIN_PASSWORD
ensure_temp_keychain(keychain_name, keychain_password)

api_key = app_store_connect_api_key(
key_id: "#{APPLE_KEY_ID}",
issuer_id: "#{APPLE_ISSUER_ID}",
key_content: "#{APPLE_KEY_CONTENT}",
duration: 1200,
in_house: false,
is_key_content_base64: true
)

match(
type: 'appstore',
app_identifier: "#{DEVELOPER_APP_IDENTIFIER}",
git_basic_authorization: Base64.strict_encode64("#{GIT_AUTHORIZATION}"),
readonly: false,
keychain_name: keychain_name,
keychain_password: keychain_password,
api_key: api_key
)

gym(
configuration: "Release",
workspace: "Inji.xcworkspace",
scheme: "Inji",
export_method: "app-store",
)

delete_temp_keychain(keychain_name)

end

lane :build_app_for_automation_on_simulator do

custom_output_directory = "./Inji_app_file"
sh("mkdir -p '#{custom_output_directory}'")
Expand Down

0 comments on commit 5787f93

Please sign in to comment.