From d6c2e92329ca2cba534a66a62d8045c982115c86 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 7 Feb 2023 21:04:27 +1100 Subject: [PATCH] Rename `GHHELPER_REPO` to `GITHUB_REPO` `GHHELPER_REPO` used to be a meaningful name in release-toolkit, but as of version 6.0.0, that [is no longer the case](https://github.com/wordpress-mobile/release-toolkit/pull/420). `GITHUB_REPO` is a much clearer and appropriate name for what the constant represents. --- fastlane/Fastfile | 2 +- fastlane/lanes/build.rb | 2 +- fastlane/lanes/release.rb | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 5d6275890da3..1563ad358cc6 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -51,7 +51,7 @@ ALL_JETPACK_BUNDLE_IDENTIFIERS = [JETPACK_BUNDLE_IDENTIFIER, *JETPACK_EXTENSIONS # Environment Variables — used by lanes but also potentially actions Dotenv.load(USER_ENV_FILE_PATH) Dotenv.load(PROJECT_ENV_FILE_PATH) -GHHELPER_REPO = 'wordpress-mobile/wordpress-iOS' +GITHUB_REPO = 'wordpress-mobile/wordpress-iOS' ENV['PROJECT_NAME'] = 'WordPress' ENV['PUBLIC_CONFIG_FILE'] = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig') ENV['INTERNAL_CONFIG_FILE'] = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.internal.xcconfig') diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb index 3163b0012a73..99cfe91bcfcb 100644 --- a/fastlane/lanes/build.rb +++ b/fastlane/lanes/build.rb @@ -150,7 +150,7 @@ version = options[:beta_release] ? ios_get_build_version : ios_get_app_version create_release( - repository: GHHELPER_REPO, + repository: GITHUB_REPO, version: version, release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'WordPress', 'Resources', 'release_notes.txt'), release_assets: archive_zip_path.to_s, diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb index 308a902b0635..f8a0e2e37b66 100644 --- a/fastlane/lanes/release.rb +++ b/fastlane/lanes/release.rb @@ -44,8 +44,8 @@ ) ios_update_release_notes(new_version: new_version) - setbranchprotection(repository: GHHELPER_REPO, branch: "release/#{new_version}") - setfrozentag(repository: GHHELPER_REPO, milestone: new_version) + setbranchprotection(repository: GITHUB_REPO, branch: "release/#{new_version}") + setfrozentag(repository: GITHUB_REPO, milestone: new_version) ios_check_beta_deps(podfile: File.join(PROJECT_ROOT_FOLDER, 'Podfile')) print_release_notes_reminder @@ -142,10 +142,10 @@ # Wrap up version = ios_get_app_version - removebranchprotection(repository: GHHELPER_REPO, branch: release_branch_name) - setfrozentag(repository: GHHELPER_REPO, milestone: version, freeze: false) - create_new_milestone(repository: GHHELPER_REPO) - close_milestone(repository: GHHELPER_REPO, milestone: version) + removebranchprotection(repository: GITHUB_REPO, branch: release_branch_name) + setfrozentag(repository: GITHUB_REPO, milestone: version, freeze: false) + create_new_milestone(repository: GITHUB_REPO) + close_milestone(repository: GITHUB_REPO, milestone: version) trigger_release_build end