Release process: Merge 0.13.10 to stable #830
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
* Cherry-pick: Updated Carthage examples to use XCF (cossacklabs#823) * Fixing Carthage examples embed settings (cossacklabs#827) * fix changelog conflict
* Updated podspec to support OpenSSL-XCF * versions update * update changelog * Cherry-pick: Updated Carthage examples to use XCF (cossacklabs#823) * Fixing Carthage examples embed settings (cossacklabs#827) * Revert "Fixing Carthage examples embed settings (cossacklabs#827)" This reverts commit d9403c5. * Revert "Cherry-pick: Updated Carthage examples to use XCF (cossacklabs#823)" This reverts commit 6c14677. * update changelog * added deprecation notice to podspec and changelog * update changelog
julepka
added
O-iOS 📱
|
Some Carthage tests are failing for no reason, reruning them usually helps. |
vixentael
approved these changes
May 27, 2021
julepka
added a commit
that referenced
this pull request
May 27, 2021
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.
Merge 0.13.10 to stable
We can do a merge commit here or I can make a direct push.
Git decided that
Carthage XCF support and OpenSSL 1.1.1k (#817)is not there... probably because it was merged with squash.Carthage Bitrise test are failing expectedly (we are waiting for a new version of Carthage that supports XCF)