diff --git a/.circleci/config.yml b/.circleci/config.yml index c738b0d452..7c7a985ba7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ jobs: - common_test_setup - build_and_run_xcode_tests - CodegenIntegration_macOS_current: + CocoaPodsIntegration_macOS_current: macos: xcode: << pipeline.parameters.xcode_version >> environment: @@ -262,5 +262,5 @@ workflows: name: Codegen Lib Unit Tests - macOS << pipeline.parameters.macos_version >> - CodegenCLI_macOS_current: name: Codegen CLI Unit Tests - macOS << pipeline.parameters.macos_version >> - - CodegenIntegration_macOS_current: - name: Codegen CLI Integration Tests - macOS << pipeline.parameters.macos_version >> + - CocoaPodsIntegration_macOS_current: + name: CocoaPods Integration Tests - macOS << pipeline.parameters.macos_version >> diff --git a/Tests/CodegenCLITests/pod-install-test/Podfile b/Tests/CodegenCLITests/pod-install-test/Podfile index 6a95f800c2..fe901de158 100644 --- a/Tests/CodegenCLITests/pod-install-test/Podfile +++ b/Tests/CodegenCLITests/pod-install-test/Podfile @@ -6,5 +6,9 @@ target 'pod-install-test' do use_frameworks! # Pods for codegen-cli-issue - pod 'Apollo', :git => 'https://github.com/apollographql/apollo-ios.git', :branch => ENV['CIRCLE_BRANCH'] + if ENV['CIRCLE_PR_REPONAME'] != nil + pod 'Apollo', :git => "https://github.com/#{ENV['CIRCLE_PR_USERNAME']}/#{ENV['CIRCLE_PR_REPONAME']}.git", :commit => ENV['CIRCLE_SHA1'] + else + pod 'Apollo', :git => 'https://github.com/apollographql/apollo-ios.git', :branch => ENV['CIRCLE_BRANCH'] + end end diff --git a/docs/shared/cli-install/pods.mdx b/docs/shared/cli-install/pods.mdx index 1544c3450b..e3d6d69ff7 100644 --- a/docs/shared/cli-install/pods.mdx +++ b/docs/shared/cli-install/pods.mdx @@ -4,4 +4,6 @@ After installing the Apollo iOS pod, you can run the Codegen CLI from the direct ```bash ./Pods/Apollo/apollo-ios-cli ${Command Name} -${Command Arguments} -``` \ No newline at end of file +``` + +> **Note:** If you are using `:path` in your Podfile to link to a local copy of Apollo iOS, the CLI will not be automatically available. You will need to manually build the Codegen CLI. See the [CLI installation guide](/ios/code-generation/codegen-cli#installation) for directions on how to do that.