Update Carthage examples to unbreak tests #829
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
julepka
added
O-iOS 📱
ilammy
approved these changes
May 26, 2021
CHANGELOG.md
Outdated
Comment on lines
7
to
8
| - Updated Carthage examples to use Themis XCFramework ([#823](https://github.com/cossacklabs/themis/pull/823)). | ||
| - Updated Carthage examples to use Themis XCFramework [#823](https://github.com/cossacklabs/themis/pull/823). | ||
| - Updated Carthage examples to use Themis XCFramework ([#823](https://github.com/cossacklabs/themis/pull/823)). | ||
| - Updated Carthage examples to use Themis XCFramework [#823](https://github.com/cossacklabs/themis/pull/823). |
There was a problem hiding this comment.
If you're changing these lines in the first place – which I believe is not strictly necessary in a PR that cherry-picks previously applied changes – then might as well remove duplication, remove duplication?
julepka
force-pushed
the
carthage-examples-0.13
branch
from
badd29c
to
7ffed53
Compare
Known problem, sometimes CircleCi can't find python
The package definitely exists. We haven't investigated yet as tests usually pass after rerun. |
vixentael
approved these changes
May 26, 2021
|
Let's merge this, once tests are green. |
|
Okay so these two tests are still failing due to absent My proof that package is still there, tests are failing are due to lunar eclipse, sharks eating transatlantic cables, or caching issues on CI servers.
I use my sudo powers and merge this PR. |
4 tasks
julepka
added a commit
that referenced
this pull request
May 27, 2021
* Carthage XCF support and OpenSSL 1.1.1k (#817) * Update Carthage examples to unbreak tests (#829) * Cherry-pick: Updated Carthage examples to use XCF (#823) * Fixing Carthage examples embed settings (#827) * fix changelog conflict * Themis CocoaPods now support CLOpenSSL-XCF (#828) * Updated podspec to support OpenSSL-XCF * versions update * update changelog * Cherry-pick: Updated Carthage examples to use XCF (#823) * Fixing Carthage examples embed settings (#827) * Revert "Fixing Carthage examples embed settings (#827)" This reverts commit d9403c5. * Revert "Cherry-pick: Updated Carthage examples to use XCF (#823)" This reverts commit 6c14677. * update changelog * added deprecation notice to podspec and changelog * update changelog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picked latest Carthage examples from master.
Now Carthage examples are using XCF and it fixes our tests.