Skip to content

Commit 957c1bb

Browse files
mattmakaimattmakai
committed
adding more stuff to CI page
1 parent d7a648b commit 957c1bb

File tree

4 files changed

+41
-10
lines changed

4 files changed

+41
-10
lines changed

‎all.html‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,14 +2217,21 @@ <h2>Open source CI projects</h2>
22172217
<a href="https://github.com/jenkinsci/jenkins">Jenkins source code is on GitHub</a>.</p>
22182218
</li>
22192219
<li>
2220-
<p><a href="http://www.go.cd/">Go CD</a> by ThoughtWorks was designed with the build and
2221-
test &amp; release cycles in mind.
2222-
<a href="https://github.com/gocd/gocd">Go CD source code is on GitHub</a></p>
2220+
<p><a href="http://www.go.cd/">Go CD</a> is a CI server by ThoughtWorks that was
2221+
designed with best practices for the build and test &amp; release cycles in
2222+
mind. <a href="https://github.com/gocd/gocd">Go CD source code is on GitHub</a>.</p>
22232223
</li>
22242224
<li>
22252225
<p><a href="http://stridercd.com/">Strider</a> is a CI server written in node.js.
22262226
<a href="https://github.com/Strider-CD/strider">Strider source code is on GitHub</a>.</p>
22272227
</li>
2228+
<li>
2229+
<p><a href="http://buildbot.net/">BuildBot</a> is a continuous integration <strong>framework</strong>
2230+
with a set of components for creating your own CI server. It's written in
2231+
Python and intended for development teams that want more controller over
2232+
their build and deployment pipeline.
2233+
<a href="https://github.com/buildbot/buildbot">BuildBot source code is on GitHub</a>.</p>
2234+
</li>
22282235
</ul>
22292236
<h2>Hosted CI services</h2>
22302237
<ul>
@@ -2242,6 +2249,10 @@ <h2>Hosted CI services</h2>
22422249
<p><a href="https://circleci.com/">Circle CI</a> works with open or closed source projects
22432250
on GitHub and can deploy them to Heroku if builds are successful.</p>
22442251
</li>
2252+
<li>
2253+
<p><a href="https://www.shippable.com/">Shippable</a> uses Docker containers to speed
2254+
the build and integration process. It's free for public repositories.</p>
2255+
</li>
22452256
</ul>
22462257
<h3>What do you want to add to your application next?</h3>
22472258
<h1>Configuration Management</h1>

‎continuous-integration.html‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,21 @@ <h2>Open source CI projects</h2>
5555
<a href="https://github.com/jenkinsci/jenkins">Jenkins source code is on GitHub</a>.</p>
5656
</li>
5757
<li>
58-
<p><a href="http://www.go.cd/">Go CD</a> by ThoughtWorks was designed with the build and
59-
test &amp; release cycles in mind.
60-
<a href="https://github.com/gocd/gocd">Go CD source code is on GitHub</a></p>
58+
<p><a href="http://www.go.cd/">Go CD</a> is a CI server by ThoughtWorks that was
59+
designed with best practices for the build and test &amp; release cycles in
60+
mind. <a href="https://github.com/gocd/gocd">Go CD source code is on GitHub</a>.</p>
6161
</li>
6262
<li>
6363
<p><a href="http://stridercd.com/">Strider</a> is a CI server written in node.js.
6464
<a href="https://github.com/Strider-CD/strider">Strider source code is on GitHub</a>.</p>
6565
</li>
66+
<li>
67+
<p><a href="http://buildbot.net/">BuildBot</a> is a continuous integration <strong>framework</strong>
68+
with a set of components for creating your own CI server. It's written in
69+
Python and intended for development teams that want more controller over
70+
their build and deployment pipeline.
71+
<a href="https://github.com/buildbot/buildbot">BuildBot source code is on GitHub</a>.</p>
72+
</li>
6673
</ul>
6774
<h2>Hosted CI services</h2>
6875
<ul>
@@ -80,6 +87,10 @@ <h2>Hosted CI services</h2>
8087
<p><a href="https://circleci.com/">Circle CI</a> works with open or closed source projects
8188
on GitHub and can deploy them to Heroku if builds are successful.</p>
8289
</li>
90+
<li>
91+
<p><a href="https://www.shippable.com/">Shippable</a> uses Docker containers to speed
92+
the build and integration process. It's free for public repositories.</p>
93+
</li>
8394
</ul>
8495
<h3>What do you want to add to your application next?</h3>
8596
<div class="row">

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-08-09T16:35:23Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-08-10T11:03:27Z</updated></feed>

‎source/content/pages/06-automation/0602-continuous-integration.markdown‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,19 @@ do not break existing tests ensure the software works as intended.
3232
deploying to test and production servers.
3333
[Jenkins source code is on GitHub](https://github.com/jenkinsci/jenkins).
3434

35-
* [Go CD](http://www.go.cd/) by ThoughtWorks was designed with the build and
36-
test & release cycles in mind.
37-
[Go CD source code is on GitHub](https://github.com/gocd/gocd)
35+
* [Go CD](http://www.go.cd/) is a CI server by ThoughtWorks that was
36+
designed with best practices for the build and test & release cycles in
37+
mind. [Go CD source code is on GitHub](https://github.com/gocd/gocd).
3838

3939
* [Strider](http://stridercd.com/) is a CI server written in node.js.
4040
[Strider source code is on GitHub](https://github.com/Strider-CD/strider).
4141

42+
* [BuildBot](http://buildbot.net/) is a continuous integration **framework**
43+
with a set of components for creating your own CI server. It's written in
44+
Python and intended for development teams that want more controller over
45+
their build and deployment pipeline.
46+
[BuildBot source code is on GitHub](https://github.com/buildbot/buildbot).
47+
4248

4349
## Hosted CI services
4450
* [Travis CI](https://travis-ci.org/) provides free CI for open source
@@ -52,5 +58,8 @@ do not break existing tests ensure the software works as intended.
5258
* [Circle CI](https://circleci.com/) works with open or closed source projects
5359
on GitHub and can deploy them to Heroku if builds are successful.
5460

61+
* [Shippable](https://www.shippable.com/) uses Docker containers to speed
62+
the build and integration process. It's free for public repositories.
63+
5564

5665
### What do you want to add to your application next?

0 commit comments

Comments
 (0)