Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fork PRs failing CocoaPods integration test #2715

Merged
merged 3 commits into from
Dec 13, 2022
Merged

fix: Fork PRs failing CocoaPods integration test #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f6bf57
Rename CI job
calvincestari Dec 8, 2022
0481a4c
Build pod location from CI environment
calvincestari Dec 8, 2022
66f6622
Update docs for local pod installations
calvincestari Dec 9, 2022
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
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 >>
6 changes: 5 additions & 1 deletion Tests/CodegenCLITests/pod-install-test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion docs/shared/cli-install/pods.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
```
```

> **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.