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

One of the CI job for Plugin builds fail after adding .gitattributes file #8879

Closed
mattab opened this issue Oct 1, 2015 · 2 comments
Closed

One of the CI job for Plugin builds fail after adding .gitattributes file #8879

mattab opened this issue Oct 1, 2015 · 2 comments
Labels
c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. Major Indicates the severity or impact or benefit of an issue is much higher than normal but not critical. not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Regression Indicates a feature used to work in a certain way but it no longer does even though it should.
Milestone
2.15.0

Comments

@mattab
Copy link
Member

mattab commented Oct 1, 2015

One of the CI job for Plugin builds fail after adding .gitattributes file

Example: https://travis-ci.org/PiwikPRO/plugin-InterSites/jobs/82195387

This problem occurs for open source and premium plugins.

Ideally we need to fix it before Sunday when all builds of all plugins are restarted automatically. If we can fix this issue in time, many of the builds will be green on Monday. This will help very much assess our progress on Release 2.15.0 #8787

Example CI job output:

1.18s$ ./tests/travis/checkout_test_against_branch.sh

Testing against '2.11.0'

HEAD is now at 7f37592 translation update

error: Your local changes to the following files would be overwritten by checkout:

    libs/pChart/GPLv3.txt

    libs/pChart/class/pData.class.php

    libs/pChart/class/pDraw.class.php

    libs/pChart/class/pImage.class.php

    libs/pChart/class/pPie.class.php

    plugins/DevicesDetection/images/brand/3Q.ico

    plugins/DevicesDetection/images/brand/BBK.ico

    plugins/DevicesDetection/images/brand/Barnes_Noble.ico

    plugins/DevicesDetection/images/brand/Celkon.ico

    plugins/DevicesDetection/images/brand/Crosscall.ico

    plugins/DevicesDetection/images/brand/Gionee.ico

    plugins/DevicesDetection/images/brand/Hyundai.ico

    plugins/DevicesDetection/images/brand/Le_Pan.ico

    plugins/DevicesDetection/images/brand/OnePlus.ico

    plugins/DevicesDetection/images/brand/Sencor.ico

    plugins/DevicesDetection/images/brand/Smartfren.ico

    plugins/DevicesDetection/images/brand/Wolder.ico

    plugins/DevicesDetection/images/brand/Yarvik.ico

    plugins/DevicesDetection/images/brand/Zopo.ico

    plugins/DevicesDetection/images/brand/iBerry.ico

Please, commit your changes or stash them before you can switch branches.

Aborting
@mattab mattab added Major Indicates the severity or impact or benefit of an issue is much higher than normal but not critical. c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Regression Indicates a feature used to work in a certain way but it no longer does even though it should. labels Oct 1, 2015
@mattab mattab added this to the 2.15.0 milestone Oct 1, 2015
@mattab mattab mentioned this issue Oct 1, 2015
Merged
@ThaDafinser
Copy link
Contributor

You can use git checkout --force to always checkout/overwrite the changes.

This is the command i use currently for deploying

see http://grimoire.ca/git/stop-using-git-pull-to-deploy

@diosmosis
Copy link
Member

Fixed by using git checkout --force, thanks @ThaDafinser!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. Major Indicates the severity or impact or benefit of an issue is much higher than normal but not critical. not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Regression Indicates a feature used to work in a certain way but it no longer does even though it should.
Projects
None yet
Milestone
2.15.0
Development

No branches or pull requests
3 participants
@diosmosis @mattab @ThaDafinser