Skip to content

Commit

Permalink
Move ecosystem sources to sources.cfg. This way mr.robot will trigger…
Browse files Browse the repository at this point in the history 
… the build if those packages change.
  • Loading branch information
@tisto
tisto committed Jun 4, 2014
1 parent 33591ed commit d62b3f4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
11 changes: 0 additions & 11 deletions ecosystem.cfg
View file
Expand Up @@ -83,14 +83,3 @@ package-map = ${alltests:package-map}
groups = ${alltests:groups}
exclude = ${alltests:exclude}
test-script = ${buildout:bin-directory}/jenkins-test


[sources]
plone.app.intid = git ${remotes:plone}/plone.app.intid.git pushurl=${remotes:plone_push}/plone.app.intid.git
plone.app.ldap = git ${remotes:plone}/plone.app.ldap.git pushurl=${remotes:plone_push}/plone.app.ldap.git
plone.app.relationfield = git ${remotes:plone}/plone.app.relationfield.git pushurl=${remotes:plone_push}/plone.app.relationfield.git branch=1.x
plone.app.referenceablebehavior = git ${remotes:plone}/plone.app.referenceablebehavior pushurl=${remotes:plone_push}/plone.app.referenceablebehavior.git
plone.app.stagingbehavior = git ${remotes:plone}/plone.app.stagingbehavior.git pushurl=${remotes:plone_push}/plone.app.stagingbehavior.git
plone.app.versioningbehavior = git ${remotes:plone}/plone.app.versioningbehavior.git pushurl=${remotes:plone_push}/plone.app.versioningbehavior.git
plone.app.contenttypes = git ${remotes:plone}/plone.app.contenttypes.git pushurl=${remotes:plone_push}/plone.app.contenttypes.git branch=1.1.x
plone.app.event = git ${remotes:plone}/plone.app.event.git pushurl=${remotes:plone_push}/plone.app.event.git branch=1.1.x
10 changes: 10 additions & 0 deletions sources.cfg
View file
Expand Up @@ -180,3 +180,13 @@ Products.TinyMCE = git ${remotes:plone}/Products.TinyMCE.git
Products.validation = git ${remotes:plone}/Products.validation.git pushurl=${remotes:plone_push}/Products.validation.git
Products.ZCatalog = git ${remotes:zopegit}/Products.ZCatalog.git pushurl=${remotes:zopegit_push}/Products.ZCatalog.git branch=2.13
Products.ZopeVersionControl = git ${remotes:zopegit}/Products.ZopeVersionControl.git pushurl=${remotes:zopegit_push}/Products.ZopeVersionControl.git

# ecosystem (those packages are not shipped with Plone 4.3)
plone.app.intid = git ${remotes:plone}/plone.app.intid.git pushurl=${remotes:plone_push}/plone.app.intid.git
plone.app.ldap = git ${remotes:plone}/plone.app.ldap.git pushurl=${remotes:plone_push}/plone.app.ldap.git
plone.app.relationfield = git ${remotes:plone}/plone.app.relationfield.git pushurl=${remotes:plone_push}/plone.app.relationfield.git branch=1.x
plone.app.referenceablebehavior = git ${remotes:plone}/plone.app.referenceablebehavior pushurl=${remotes:plone_push}/plone.app.referenceablebehavior.git
plone.app.stagingbehavior = git ${remotes:plone}/plone.app.stagingbehavior.git pushurl=${remotes:plone_push}/plone.app.stagingbehavior.git
plone.app.versioningbehavior = git ${remotes:plone}/plone.app.versioningbehavior.git pushurl=${remotes:plone_push}/plone.app.versioningbehavior.git
plone.app.contenttypes = git ${remotes:plone}/plone.app.contenttypes.git pushurl=${remotes:plone_push}/plone.app.contenttypes.git branch=1.1.x
plone.app.event = git ${remotes:plone}/plone.app.event.git pushurl=${remotes:plone_push}/plone.app.event.git branch=1.1.x

3 comments on commit d62b3f4

@mister-roboto
Copy link

Choose a reason for hiding this comment

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

TESTS PASSED
Mr.Roboto url : http://jenkins.plone.org/roboto/get_info?push=ce7918fa65f8476bb36cbfc5bc6878a9
plone-4.3-python-2.6 [SUCCESS]
plone-4.3-python-2.7 [SUCCESS]

@maartenkling
Copy link
Member

Choose a reason for hiding this comment

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

@tisto
doesn't this mean plone.app.contenttypes on line 88

d62b3f4#diff-d5766e84f18a5ddb75fe0925b3f1c939R88

and line 191
d62b3f4#diff-d5766e84f18a5ddb75fe0925b3f1c939R191

will conflict and 4.3 is now always using branch=1.1.x ( even if this is correct )

@tisto
Copy link
Member Author

@tisto tisto commented on d62b3f4 Jun 4, 2014

Choose a reason for hiding this comment

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

@maartenkling right. I forgot to check that. We have to remove line 88 of course.

Please sign in to comment.