Skip to content

[#14873] Fix code signing issue on Xcode 11 in Try Compile script#14875

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
Legoless:master
Jun 25, 2019
Merged

[#14873] Fix code signing issue on Xcode 11 in Try Compile script#14875
opencv-pushbot merged 1 commit intoopencv:3.4from
Legoless:master

Conversation

@Legoless
Copy link
Copy Markdown
Contributor

This pull request fixes #14873.

This Pull Request Changes

The PR adds to the Try Compile script explicit flags not to use code signing, as by default Xcode 11 is now looking for signing identity and the entire script fails in this case.

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 24, 2019

Thank you! Our builds are green too.

This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@Legoless Legoless changed the base branch from master to 3.4 June 25, 2019 07:42
@Legoless
Copy link
Copy Markdown
Contributor Author

@alalek I did what you asked, I would think cherrypicking the commit into 3.4 would be the easier way, but there you go. :)

Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Well done! Thank you 👍

@opencv-pushbot opencv-pushbot merged commit e755c66 into opencv:3.4 Jun 25, 2019
opencv-pushbot pushed a commit that referenced this pull request Jun 25, 2019
@alalek alalek mentioned this pull request Jun 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants