Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add workflows for macOS ARM64 and macOS x86_64 for branch 3.4 #22103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 15, 2022
Merged

Add workflows for macOS ARM64 and macOS x86_64 for branch 3.4 #22103

merged 1 commit into from
Jun 15, 2022

Conversation

fengyuentau
Copy link
Member

@fengyuentau fengyuentau commented Jun 15, 2022 •
edited by alalek
Loading

4.x: #22104
5.x: #22105

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@asenyaev
Copy link
Contributor

asenyaev commented Jun 15, 2022 •
edited
Loading

macOS jobs are failed for 3.4 branch in case of this line, there is an extra space.

opencv/ci-gha-workflow#18 is going to fix it.

@asenyaev
Copy link
Contributor

@fengyuentau, please, do re-commit. GitHub Actions work this way - if your commit was before latest changes in a repository where workflow files are located, then it will never update a new info til you update the commit.

@alalek alalek mentioned this pull request Jun 15, 2022
Merged
6 tasks
@fengyuentau fengyuentau force-pushed the macOS_workflows_for_3.4 branch from 2ed3840 to 5728122 Compare June 15, 2022 10:27
@fengyuentau
Copy link
Member Author

Sure, I have done re-commit.

@asenyaev
Copy link
Contributor

Currently, anything is fine, but not Windows:

Run OPENCV_CONTRIB_FORK=$(git ls-remote --heads "[email protected]:fengyuentau/opencv_contrib" "macOS_workflows_for_3.4") || true
  
Merge opencv_contrib with macOS_workflows_for_3.4 branch
From github.com:fengyuentau/opencv_contrib
 * branch                macOS_workflows_for_3.4 -> FETCH_HEAD
fatal: refusing to merge unrelated histories
Error: Process completed with exit code 128.

@fengyuentau, could you remove this branch in your opencv_contrib fork? As I see, workflows for opencv_contrib repository have been merged.

@fengyuentau
Copy link
Member Author

Yes, branches in my opencv_contrib fork are deleted. Failed job is re-run and passed.

asenyaev
asenyaev approved these changes Jun 15, 2022
View reviewed changes
Copy link
Contributor

@asenyaev asenyaev left a comment

Choose a reason for hiding this comment

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

Thank you! 👍

@opencv-pushbot opencv-pushbot merged commit 3efc645 into opencv:3.4 Jun 15, 2022
@fengyuentau fengyuentau deleted the macOS_workflows_for_3.4 branch July 18, 2022 03:07
@alalek alalek mentioned this pull request Aug 21, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

@asmorkalov asmorkalov Awaiting requested review from asmorkalov

+1 more reviewer

@asenyaev asenyaev asenyaev approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@asenyaev asenyaev

Labels

CI/CD: GitHub Actions (GHA) Changes related to CI/CD pipelines (GitHub Actions)

Projects

None yet

Milestone

3.4.19

Development

Successfully merging this pull request may close these issues.

4 participants

@fengyuentau @asenyaev @alalek @opencv-pushbot