From f46ad7965156d80df81c2c97bb878aadb5a0ed22 Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Fri, 8 Mar 2024 17:18:18 -0500 Subject: [PATCH] Update Fastlane config and workflows (#34) --- .github/workflows/ios_emerge_upload_main.yml | 3 --- .github/workflows/ios_emerge_upload_pr.yml | 3 --- .../workflows/ios_emerge_upload_snapshots.yml | 3 --- ios/Gemfile.lock | 2 +- ios/fastlane/Fastfile | 16 ++-------------- 5 files changed, 3 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ios_emerge_upload_main.yml b/.github/workflows/ios_emerge_upload_main.yml index 3e18144f..f8712ce5 100644 --- a/.github/workflows/ios_emerge_upload_main.yml +++ b/.github/workflows/ios_emerge_upload_main.yml @@ -44,8 +44,5 @@ jobs: SIGNING_KEY_PASSWORD: ${{ secrets.IOS_DIST_SIGNING_KEY_PASSWORD }} SIGNING_KEY_FILE_PATH: signing-cert.p12 EMERGE_API_TOKEN: ${{ secrets.EMERGE_API_KEY }} - BASE_SHA: ${{ github.event.pull_request.base.sha }} - COMMIT_SHA: ${{ github.event.pull_request.head.sha }} - PULL_NUMBER: ${{ github.event.pull_request.number }} SCHEME: Release EMERGE_BUILD_TYPE: release diff --git a/.github/workflows/ios_emerge_upload_pr.yml b/.github/workflows/ios_emerge_upload_pr.yml index 088756a5..90b24cbd 100644 --- a/.github/workflows/ios_emerge_upload_pr.yml +++ b/.github/workflows/ios_emerge_upload_pr.yml @@ -44,8 +44,5 @@ jobs: SIGNING_KEY_PASSWORD: ${{ secrets.IOS_DIST_SIGNING_KEY_PASSWORD }} SIGNING_KEY_FILE_PATH: signing-cert.p12 EMERGE_API_TOKEN: ${{ secrets.EMERGE_API_KEY }} - BASE_SHA: ${{ github.event.pull_request.base.sha }} - COMMIT_SHA: ${{ github.event.pull_request.head.sha }} - PULL_NUMBER: ${{ github.event.pull_request.number }} SCHEME: Release EMERGE_BUILD_TYPE: pull-request diff --git a/.github/workflows/ios_emerge_upload_snapshots.yml b/.github/workflows/ios_emerge_upload_snapshots.yml index b6aad7c6..93480574 100644 --- a/.github/workflows/ios_emerge_upload_snapshots.yml +++ b/.github/workflows/ios_emerge_upload_snapshots.yml @@ -53,9 +53,6 @@ jobs: SIGNING_KEY_PASSWORD: ${{ secrets.IOS_DIST_SIGNING_KEY_PASSWORD }} SIGNING_KEY_FILE_PATH: signing-cert.p12 EMERGE_API_TOKEN: ${{ secrets.EMERGE_API_KEY }} - BASE_SHA: ${{ github.event.pull_request.base.sha }} - COMMIT_SHA: ${{ github.event.pull_request.head.sha }} - PULL_NUMBER: ${{ github.event.pull_request.number }} SCHEME: Debug EMERGE_BUILD_TYPE: snapshot BUNDLE_ID: com.emerge.hn.Hacker-News.snapshots diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock index 9cf09d00..40d510fa 100644 --- a/ios/Gemfile.lock +++ b/ios/Gemfile.lock @@ -109,7 +109,7 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-emerge (0.7.0) + fastlane-plugin-emerge (0.8.0) faraday (~> 1.1) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 64a2bcc4..5b957601 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -141,13 +141,7 @@ platform :ios do fetch_and_increment_build_number build_app_for_scheme(build_configuration: ENV['SCHEME']) upload_app - emerge( - repo_name: ENV['GITHUB_REPOSITORY'], - pr_number: ENV['PULL_NUMBER'], - sha: (ENV.has_key?('COMMIT_SHA') && ENV['COMMIT_SHA'].length > 0) ? ENV['COMMIT_SHA'] : ENV['GITHUB_SHA'], - base_sha: ENV['BASE_SHA'], - tag: ENV['EMERGE_BUILD_TYPE'] - ) + emerge(tag: ENV['EMERGE_BUILD_TYPE']) # TODO(telkins) # sentry_cli( @@ -162,12 +156,6 @@ platform :ios do load_asc_api_key prepare_signing build_app_for_scheme(build_configuration: ENV['SCHEME']) - emerge( - repo_name: ENV['GITHUB_REPOSITORY'], - pr_number: ENV['PULL_NUMBER'], - sha: (ENV.has_key?('COMMIT_SHA') && ENV['COMMIT_SHA'].length > 0) ? ENV['COMMIT_SHA'] : ENV['GITHUB_SHA'], - base_sha: ENV['BASE_SHA'], - tag: ENV['EMERGE_BUILD_TYPE'] - ) + emerge(tag: ENV['EMERGE_BUILD_TYPE']) end end