Skip to content
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

Arch artwork alignment #433

Merged
merged 5 commits into from Jan 12, 2017
Merged

Arch artwork alignment #433

merged 5 commits into from Jan 12, 2017

Conversation

agryson
Copy link
Contributor

@agryson agryson commented Jan 11, 2017 •
edited

@agryson
Align Arch Workench icons to Tango
39e48dd
@agryson
Update Arch Workbench icon metadata
4bf8b51
@agryson
Minor updates and polish
1f43ad7 
* New icon had been added since I started work, so aligned that
* Removed a copy/paste artefact on a clone icon
@agryson
Revert modifications to 3rd party icon
8e87cd6 
3rd party icons will be reviewed after alignment of all other icons
See [this forum discussion for more on this issue](http://forum.freecadweb.org/viewtopic.php?f=23&t=19556&p=151812#p151812)
I'm mainting this as it's own commit for easy reversion in the future should we decide to update 3rd party icons
@agryson
fix broken shadow
032ead0
@agryson
Copy link
Contributor Author

agryson commented Jan 12, 2017 •
edited

This build failed for the following reason

FAIL: testSlotCase (TestSketcherApp.SketcherSolverTestCases)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/local/FreeCAD.app/Contents/Mod/Sketcher/TestSketcherApp.py", line 112, in testSlotCase
    self.failUnless(len(self.Slot.Shape.Edges) == 4)
AssertionError: False is not true

I don't understand how svgs could cause this and it's the second time the third travis build fails while the other two pass... Could someone who knows more about the build process explain the issue to me ?

@agryson
Copy link
Contributor Author

agryson commented Jan 12, 2017

wtf? Now all checks say they've passed, but as you can see, the clang xCode one most definitely hadn't... and I didn't add any commits to run the tests again... does anyone know what's going on?

@sgrogan
Copy link
Contributor

sgrogan commented Jan 12, 2017

I re-started the build and it passed this time. The error was strange. There was a similar error in master yesterday but only on 64 bit Windows? https://ci.appveyor.com/project/yorikvanhavre/freecad/build/1.0.1013/job/7l5ovgeirj22pkaw#L9598

@agryson
Copy link
Contributor Author

agryson commented Jan 12, 2017

Ah, thanks for the clarification and restart. Pull request 398 had a similar issue which @yorikvanhavre bypassed manually, but obviously the issue has been around for a while... 😟

@wwmayer wwmayer merged commit 0c34f1b into FreeCAD:master Jan 12, 2017
@agryson agryson mentioned this pull request Jan 12, 2017
Closed
@agryson agryson deleted the arch-artwork-alignment branch January 13, 2017 06:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@agryson @sgrogan @wwmayer