Skip to content

Prep for Mojave test #24572

Merged
veblush merged 3 commits intogrpc:masterfrom
veblush:ios-tests
Oct 30, 2020
Merged

Prep for Mojave test #24572
veblush merged 3 commits intogrpc:masterfrom
veblush:ios-tests

Conversation

@veblush
Copy link
Copy Markdown
Contributor

@veblush veblush commented Oct 26, 2020 •
edited
Loading

3 things are done in this PR as a preparation of migration to Mojave which doesn't have XCode 9

  • Removing xcode pinning in the script
  • Upgrading cocoapods to address EXPANDED_CODE_SIGN_IDENTITY unbound error.
  • Configuring port_platform to use PTHREAD_TLS instead of STDCPP_TLS when it's not available. This shouldn't happen to real devices but it can happen when running on the simulator. (e.g. iOS 9 32bits simulator)

Clang TLS Reference: (code)

# https://clang.llvm.org/doxygen/OSTargets_8h_source.html
     if (Triple.isMacOSX())
       this->TLSSupported = !Triple.isMacOSXVersionLT(10, 7);
     else if (Triple.isiOS()) {
       // 64-bit iOS supported it from 8 onwards, 32-bit device from 9 onwards,
       // 32-bit simulator from 10 onwards.
       if (Triple.isArch64Bit())
         this->TLSSupported = !Triple.isOSVersionLT(8);
       else if (Triple.isArch32Bit()) {
         if (!Triple.isSimulatorEnvironment())
           this->TLSSupported = !Triple.isOSVersionLT(9);
         else
           this->TLSSupported = !Triple.isOSVersionLT(10);
       }
     } else if (Triple.isWatchOS()) {
       if (!Triple.isSimulatorEnvironment())
         this->TLSSupported = !Triple.isOSVersionLT(2);
       else
         this->TLSSupported = !Triple.isOSVersionLT(3);
     }

@veblush veblush added the release notes: no Indicates if PR should not be in release notes label Oct 26, 2020
@veblush veblush force-pushed the ios-tests branch 2 times, most recently from 0c50ea5 to 89afe46 Compare October 27, 2020 02:47
@veblush veblush requested a review from jtattermusch October 28, 2020 20:34
@veblush veblush marked this pull request as ready for review October 28, 2020 20:35
@veblush
Copy link
Copy Markdown
Contributor Author

veblush commented Oct 28, 2020 •
edited
Loading

grpc_build_artifacts_multiplatform: failed with timeout
grpc_build_artifacts_multiplatform: failed on Linux?
grpc_build_artifacts_multiplatform: failed with timeout
grpc_build_artifacts_multiplatform: failed on Linux with C#?

This result is not clear to me because it's not relevant to iOS changes so let's get this merged and roll it back if this is real. It happens at build_package.csharp_package_nuget_linux.

+ dotnet pack --configuration Release Grpc --output ../../../artifacts
Microsoft (R) Build Engine version 15.9.20+g88f5fadfbe for .NET Core
Copyright (C) Microsoft Corporation. All rights reserved.

  Restoring packages for /var/local/git/grpc/src/csharp/Grpc/Grpc.csproj...
  Restore completed in 16.5 ms for /var/local/git/grpc/src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj.
  Restore completed in 16.5 ms for /var/local/git/grpc/src/csharp/Grpc.Core/Grpc.Core.csproj.
  Generating MSBuild file /var/local/git/grpc/src/csharp/Grpc/obj/Grpc.csproj.nuget.g.props.
  Generating MSBuild file /var/local/git/grpc/src/csharp/Grpc/obj/Grpc.csproj.nuget.g.targets.
  Restore completed in 340.69 ms for /var/local/git/grpc/src/csharp/Grpc/Grpc.csproj.
/var/local/git/grpc/src/csharp/Grpc/Grpc.csproj(3,3): error MSB4019: The imported project "/var/local/git/grpc/src/csharp/Grpc.Core/Common.csproj.include" was not found. Confirm that the path in the <Import> declaration is correct, and that the file exists on disk.

jtattermusch
jtattermusch approved these changes Oct 30, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@jtattermusch jtattermusch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@veblush veblush merged commit 24d115d into grpc:master Oct 30, 2020
@tamird tamird mentioned this pull request Aug 10, 2021
Merged
@veblush veblush mentioned this pull request Aug 10, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jtattermusch jtattermusch jtattermusch approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/build kind/internal cleanup platform/iOS release notes: no Indicates if PR should not be in release notes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@veblush @jtattermusch