Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ temp/
# Build & deployment files
/android/app/google-services.json
/android/google-java-format-*.jar
/release-version.json
/deploy-config.json
/env.json
/fastlane.json
/ios/edge/GoogleService-Info.plist
/ios/Pods/
android-release.bundle.map
env.json
/release-version.json
IDEWorkspaceChecks.plist
android-release.bundle.map
ios-release.bundle.map
keystores/

Expand Down
8 changes: 3 additions & 5 deletions scripts/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,6 @@ function buildIos(buildObj: BuildObj) {
chdir(buildObj.guiDir)
if (
process.env.BUILD_REPO_URL &&
process.env.FASTLANE_USER != null &&
process.env.FASTLANE_PASSWORD != null &&
// process.env.GITHUB_SSH_KEY != null &&
process.env.HOME != null &&
process.env.MATCH_KEYCHAIN_PASSWORD != null &&
Expand All @@ -202,13 +200,13 @@ function buildIos(buildObj: BuildObj) {
const profileDir = join(process.env.HOME, 'Library', 'MobileDevice', 'Provisioning Profiles')
call(`rm -rf ${escapePath(profileDir)}`)
call(
`GIT_SSH_COMMAND="ssh -i ${githubSshKey}" fastlane match adhoc --git_branch="${buildObj.appleDeveloperTeamName}" -a ${buildObj.bundleId} --team_id ${buildObj.appleDeveloperTeamId}`
`GIT_SSH_COMMAND="ssh -i ${githubSshKey}" fastlane match adhoc --git_branch="${buildObj.appleDeveloperTeamName}" -a ${buildObj.bundleId} --team_id ${buildObj.appleDeveloperTeamId} --api_key_path fastlane.json`
)
call(
`GIT_SSH_COMMAND="ssh -i ${githubSshKey}" fastlane match development --git_branch="${buildObj.appleDeveloperTeamName}" -a ${buildObj.bundleId} --team_id ${buildObj.appleDeveloperTeamId}`
`GIT_SSH_COMMAND="ssh -i ${githubSshKey}" fastlane match development --git_branch="${buildObj.appleDeveloperTeamName}" -a ${buildObj.bundleId} --team_id ${buildObj.appleDeveloperTeamId} --api_key_path fastlane.json`
)
call(
`GIT_SSH_COMMAND="ssh -i ${githubSshKey}" fastlane match appstore --git_branch="${buildObj.appleDeveloperTeamName}" -a ${buildObj.bundleId} --team_id ${buildObj.appleDeveloperTeamId}`
`GIT_SSH_COMMAND="ssh -i ${githubSshKey}" fastlane match appstore --git_branch="${buildObj.appleDeveloperTeamName}" -a ${buildObj.bundleId} --team_id ${buildObj.appleDeveloperTeamId} --api_key_path fastlane.json`
)
} else {
mylog('Missing or incomplete Fastlane params. Not using Fastlane')
Expand Down
5 changes: 3 additions & 2 deletions scripts/secretFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ const githubSshKey = process.env.GITHUB_SSH_KEY ?? join(baseDir, 'id_github')

const filePaths = [
{ file: 'deploy-config.json', path: './' },
{ file: 'env.json', path: './' },
{ file: 'fastlane.json', path: './' },
{ file: 'GoogleService-Info.plist', path: './ios/edge/' },
{ file: 'google-services.json', path: './android/app/' },
{ file: 'env.json', path: './' }
{ file: 'google-services.json', path: './android/app/' }
]

async function main() {
Expand Down
Loading