Updates of example projects for Xcode12.0.1 #722
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
vixentael
added
M-CocoaPods
vixentael
added
the
M-Carthage
vixentael
changed the title
|
Okay, so I've updated Bitrise and Github actions to use Xcode 12.0.1, and exclude arm64 for Carthage builds. |
ilammy
reviewed
Oct 13, 2020
Comment on lines
+178
to
+189
| # ------ beginning of workaround | ||
| # from https://github.com/Carthage/Carthage/issues/3019#issuecomment-699143260 | ||
| # supports Xcode 12.0.1 | ||
| set -euo pipefail | ||
| xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) | ||
| trap 'rm -f "$xcconfig"' INT TERM HUP EXIT | ||
| # For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise | ||
| # the build will fail on lipo due to duplicate architectures. | ||
| echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig | ||
| echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig | ||
| export XCODE_XCCONFIG_FILE="$xcconfig" | ||
| # ------ end of workaround |
There was a problem hiding this comment.
I believe it would be better to create a config file in our repo and then
export XCODE_XCCONFIG_FILE="path/to/our.xcconfig"
instead of creating a temporary file, etc.
The set -euo pipefail can also be omitted in this case. GitHub Actions already enable that, IIRC.
There was a problem hiding this comment.
I agree, but I really hope that these are temporally measures and we won't need them soon.
(Nothing is more permanent than a temporary solution)
ilammy
approved these changes
Oct 13, 2020
ilammy
pushed a commit
to ilammy/themis
that referenced
this pull request
Oct 26, 2020
* github actions -> use xcode 12.0 * updating ios swift cocoapods example for themis 0.13.3 * disable openssl-1.1.1 subspec * "fix" carthage build by disabling arm64 * github actions: carthage, exclude arm64 architecture * update changelog (cherry picked from commit 1ae32a3)
ilammy
added a commit
to ilammy/themis
that referenced
this pull request
Oct 26, 2020
…cossacklabs#724, cossacklabs#726) * Switch github actions to Xcode12 [ios, macos] (cossacklabs#721) - update github actions xcode12 - update changelog - update swift ios cocoapods project (cherry picked from commit d22bbab) * Updates of example projects for Xcode12.0.1 (cossacklabs#722) - github actions -> use xcode 12.0 - updating ios swift cocoapods example for themis 0.13.3 - disable openssl-1.1.1 subspec - "fix" carthage build by disabling arm64 - github actions: carthage, exclude arm64 architecture - update changelog (cherry picked from commit 1ae32a3) * update ios objc and server examples for themis 0.13.3 (cossacklabs#723) - update ios objc and server examples for themis 0.13.3 - updated changelog (cherry picked from commit dc336bb) * update iOS carthage examples for themis 0.13.3 (cossacklabs#724) - update iOS carthage examples for themis 0.13.3 - updated changelog (cherry picked from commit 0577424) * updated macOS examples for themis 0.13.3 (cossacklabs#726) - updated macOS examples for themis 0.13.3 - updated changelog (cherry picked from commit 9f14a5e) I've squashed all commits in one as conceptually this is a single change migrating the build to Xcode 12 and examples to Themis 0.13.3 which supports Xcode 12. The changes do not include CHANGELOG.md, but that will be synced later during the next major release. Signed-off-by: Alexei Lozovsky <alexei@cossacklabs.com> Co-authored-by: julepka <julepka@gmail.com> Co-authored-by: vixentael <vixentael@users.noreply.github.com>
4 tasks
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.
Apparently, updating Github Actions to Xcode 12.2 (#721) was a bad idea, as Xcode 12.0.1 and Xcode 12.2 are quite different, let's not rush things.
This update sets Xcode 12.0 as Github actions Xcode, and updates iOS Swift CocoaPods example.
Expected behaviour: to see more tests going green.
Checklist