Skip to content

Conversation

@giordano
Copy link
Contributor

This is not meant to be merged now, it's just for testing

@giordano
Copy link
Contributor Author

giordano commented Oct 10, 2019

Travis on macOS is running deps/build.jl 😳 This is crazy, the file is not in this branch! A colleague today experienced problems with Travis picking up a wrong branch for testing (or is it GitHub messing up things?) Those messages probably came from building Cairo, not Rsvg

@giordano giordano force-pushed the artifacts branch 4 times, most recently from 645c27b to 8f50557 Compare October 11, 2019 09:42
Copy link
Collaborator

@davidanthoff davidanthoff left a comment

Choose a reason for hiding this comment

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

Alright, now that Cairo.jl is merged, lets move this forward :)

@davidanthoff davidanthoff mentioned this pull request Nov 28, 2019
@giordano
Copy link
Contributor Author

Ok, I should have fixed merge conflicts that prevented CI from running before

@giordano giordano marked this pull request as ready for review November 30, 2019 17:34
@giordano giordano closed this Dec 1, 2019
@giordano giordano reopened this Dec 1, 2019
@davidanthoff
Copy link
Collaborator

Looks like there is still a merge conflict?

@giordano
Copy link
Contributor Author

giordano commented Dec 1, 2019

After the new commits to master, yes. I'll fix in the next few days

@davidanthoff davidanthoff merged commit 53f0946 into lobingera:master Dec 7, 2019
@giordano giordano deleted the artifacts branch December 7, 2019 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants