com presentations: Tweaks: afup15.html afup15.xml slides/intro/ etsy_deploy.xml slides/intro/fr-peace-black.png slide s/intro/merci.xml slides/intro/php7_2016.xml

[email protected] (Rasmus Lerdorf) Mon, 23 Nov 2015 21:12:18 +0000
Newsgroups php.pres
Message-ID <[email protected]>
Commit:    b93083ee342332ba39e4d7c3524de215e1c52c10
Author:    Rasmus Lerdorf <[email protected]>         Mon, 23 Nov 2015 22:11:56 +0100
Parents:   c9c7cc89b9b4a33681606be8632a0ec93279e8b2
Branches:  master

Link:       http://git.php.net/?p=presentations.git;a=commitdiff;h=b93083ee342332ba39e4d7c3524de215e1c52c10

Log:
Tweaks

Changed paths:
  M  afup15.html
  M  afup15.xml
  M  slides/intro/etsy_deploy.xml
  A  slides/intro/fr-peace-black.png
  A  slides/intro/merci.xml
  M  slides/intro/php7_2016.xml
diff_b93083ee342332ba39e4d7c3524de215e1c52c10.txt (text/plain, 11.1 KB)
diff --git a/afup15.html b/afup15.html
index 64fc679..d4b29b1 100644
--- a/afup15.html
+++ b/afup15.html
@@ -120,7 +120,11 @@
 					<aside class="notes">
 											</aside>
 				</section>
-					<section>
+					<section data-background="#000000">
+		<h1 style="text-align:center;"><font color="FFFFFF">Merci AFUP!</font></h1>
+		<img src="/presentations/slides/intro/fr-peace-black.png" align="center" width="640" height="550">
+	</section>
+	<section>
 		<section id="php7">
 		<img src="/presentations/slides/intro/php7trans-200.png"  width="" height="">
 		<p class="p" style="font-size:1.1em;text-align:left;">✔ engine improvements</p>
@@ -551,8 +555,18 @@ $foo()()
 echo &quot;\u{1F602}&quot;;</code></pre>
 		<pre class="output" style="font-size:1.2em;">‮Right-to-left text😂		</pre>		<p class="p" style="font-size:1.1em;text-align:left;">✔ ICU IntlChar class added to intl extension</p>
 		</section>
+<section id="php7csprng">
+		<p class="p" style="font-size:1.1em;text-align:left;">✔ CSPRNG</p>
+		<pre><code data-trim style="font-size:1.2em;">$int   = random_int(-500, 500);
+$bytes = random_bytes(10);
+
+var_dump( $int );
+var_dump( bin2hex($bytes) );</code></pre>
+		<pre class="output" style="font-size:1.2em;">int(-57)
+string(20) "0fccee1859e2ed386eab"
+		</pre>		</section>
 <section id="php7more">
-		<p class="p" style="font-size:1.5em;">GA release scheduled for Nov.26 or Dec.12</p>
+		<p class="p" style="font-size:1.5em;">GA release scheduled for Nov.26 or Dec.3</p>
 		</section>	</section>
 	<section>
 		<section id="perf2014">
@@ -1214,9 +1228,21 @@ Rasmus: .in
 *** pushbot has changed the topic on #push *bob *Rasmus</code></pre>
 		</section>
 <section id="etsy_deploy1">
-		<img src="/presentations/slides/intro/deployinator.png"  width="" height="">
+		<p class="p" style="font-size:2em;text-align:left;">pushbot commands</p>
+		<ul>
+			<li style="list-style-type: none;"><strong>.join</strong>    - join push queue</li>
+			<li style="list-style-type: none;"><strong>.in</strong>        - code has been pushed</li>
+			<li style="list-style-type: none;"><strong>.good</strong> - your stuff looks good</li>
+			<li style="list-style-type: none;"><strong>.uhoh</strong> - your stuff looks bad</li>
+			<li style="list-style-type: none;"><strong>.hold</strong>  - there is a problem, hold everything</li>
+			<li style="list-style-type: none;"><strong>.nm</strong>      - never mind (leave queue)</li>
+			<li style="list-style-type: none;"><strong>.done</strong> - push done</li>
+		</ul>
 		</section>
 <section id="etsy_deploy2">
+		<img src="/presentations/slides/intro/deployinator.png"  width="" height="">
+		</section>
+<section id="etsy_deploy3">
 		<pre><code class="shell nohighlight" data-trim style="font-size:1.1em;">Channel: #push Topic: &lt;princess&gt; bob Rasmus
 Jenkins: Starting build #36803 for job qa
 Jenkins: Starting build #38784 for job princess
@@ -1232,7 +1258,7 @@ pushbot: bob Rasmus : everyone is ready, checking on Jenkins...
 Jenkins: qa: last build: 36803 (9 min 5 sec ago): SUCCESS: http://ci.etsy/job/qa/36803/
 Jenkins: princess: last build: 38784 (2 min 54 sec ago): SUCCESS: http://ci.etsy/job/princess/38784/</code></pre>
 		</section>
-<section id="etsy_deploy3">
+<section id="etsy_deploy4">
 		<p class="p" style="font-size:2.5em;text-align:left;">Deploy to Production:</p>
 		<ul>
 			<li style="font-size: 2em;">ssh to deploy host</li>
@@ -1240,7 +1266,7 @@ Jenkins: princess: last build: 38784 (2 min 54 sec ago): SUCCESS: http://ci.etsy
 			<li style="font-size: 2em;">rsync files</li>
 		</ul>
 		</section>
-<section id="etsy_deploy4">
+<section id="etsy_deploy5">
 		<pre><code class="shell nohighlight" data-trim style="font-size:1.1em;">Channel: #push Topic: &lt;prod&gt; bob Rasmus
 devbot: Swapping symlinks. Your code is about to start taking production traffic
 pushbot: bob Rasmus : Your code is live. Time to watch graphs: http://etsy/et5cp
@@ -1256,7 +1282,7 @@ bob: .done
 pushbot: clear
 *** pushbot has changed the topic on #push to clear</code></pre>
 		</section>
-<section id="etsy_deploy5">
+<section id="etsy_deploy6">
 		<p class="p" style="font-size:2.5em;text-align:left;">Graph Everything!</p>
 		<ul>
 			<li style="font-size: 2em;">Statsd</li>
@@ -1264,7 +1290,7 @@ pushbot: clear
 			<li style="font-size: 2em;">Graphite</li>
 		</ul>
 		</section>
-<section id="etsy_deploy6">
+<section id="etsy_deploy7">
 		<p class="p" style="font-size:2.5em;text-align:left;">Log Everything!</p>
 		<ul>
 			<li style="font-size: 2em;">logster</li>
@@ -1273,7 +1299,7 @@ pushbot: clear
 			<li style="font-size: 2em;">Elastic Search</li>
 		</ul>
 		</section>
-<section id="etsy_deploy7">
+<section id="etsy_deploy8">
 		<ul>
 			<li style="font-size: 1.5em;">Commit to master</li>
 			<li style="font-size: 1.5em;">Deploy from HEAD</li>
@@ -1281,10 +1307,10 @@ pushbot: clear
 			<li style="font-size: 1.5em;">Branches are in code via feature flags</li>
 		</ul>
 		</section>
-<section id="etsy_deploy8">
+<section id="etsy_deploy9">
 		<p class="p" style="font-size:2.5em;text-align:left;">Blameless post-mortems</p>
 		</section>
-<section id="etsy_deploy9">
+<section id="etsy_deploy10">
 		<div align="left" style="font-size: 1.2em; color: ; text-align: left; margin-left: 2em; margin-right: ; margin-top: ; margin-bottom: ;"><a href="https://github.com/etsy/deployinator" target="">github.com/etsy/deployinator</a></div>
 		<div align="left" style="font-size: 1.2em; color: ; text-align: left; margin-left: 2em; margin-right: ; margin-top: ; margin-bottom: ;"><a href="https://github.com/etsy/statsd" target="">github.com/etsy/statsd</a></div>
 		<div align="left" style="font-size: 1.2em; color: ; text-align: left; margin-left: 2em; margin-right: ; margin-top: ; margin-bottom: ;"><a href="https://github.com/etsy/logster" target="">github.com/etsy/logster</a></div>
diff --git a/afup15.xml b/afup15.xml
index addc7ff..b60218a 100644
--- a/afup15.xml
+++ b/afup15.xml
@@ -24,6 +24,7 @@
 
 <slide>slides/intro/titlepage.xml</slide>
 
+<slide>slides/intro/merci.xml</slide>
 <slide>slides/intro/php7_2016.xml</slide>
 <slide>slides/intro/perf2014.xml</slide>
 <slide>slides/intro/php7_perf.xml</slide>
diff --git a/slides/intro/etsy_deploy.xml b/slides/intro/etsy_deploy.xml
index db34b8d..334b9e9 100644
--- a/slides/intro/etsy_deploy.xml
+++ b/slides/intro/etsy_deploy.xml
@@ -23,9 +23,21 @@ Rasmus: .in
 ]]></example>
 
 <break lines="1" section="etsy_deploy1"/>
-<image filename="deployinator.png"/>
+<blurb fontsize="2em" align="left">pushbot commands</blurb>
+<list>
+<bullet type="none">*.join*    - join push queue</bullet>
+<bullet type="none">*.in*        - code has been pushed</bullet>
+<bullet type="none">*.good* - your stuff looks good</bullet>
+<bullet type="none">*.uhoh* - your stuff looks bad</bullet>
+<bullet type="none">*.hold*  - there is a problem, hold everything</bullet>
+<bullet type="none">*.nm*      - never mind (leave queue)</bullet>
+<bullet type="none">*.done* - push done</bullet>
+</list>
 
 <break lines="1" section="etsy_deploy2"/>
+<image filename="deployinator.png"/>
+
+<break lines="1" section="etsy_deploy3"/>
 <example fontsize="1.1em" result='0' title="" type="shell nohighlight"><![CDATA[
 Channel: #push Topic: <princess> bob Rasmus
 Jenkins: Starting build #36803 for job qa
@@ -43,7 +55,7 @@ Jenkins: qa: last build: 36803 (9 min 5 sec ago): SUCCESS: http://ci.etsy/job/qa
 Jenkins: princess: last build: 38784 (2 min 54 sec ago): SUCCESS: http://ci.etsy/job/princess/38784/
 ]]></example>
 
-<break lines="1" section="etsy_deploy3"/>
+<break lines="1" section="etsy_deploy4"/>
 <blurb fontsize="2.5em" align="left">Deploy to Production:</blurb>
 <list>
 <bullet fontsize="2em" align="left">ssh to deploy host</bullet>
@@ -51,7 +63,7 @@ Jenkins: princess: last build: 38784 (2 min 54 sec ago): SUCCESS: http://ci.etsy
 <bullet fontsize="2em" align="left">rsync files</bullet>
 </list>
 
-<break lines="1" section="etsy_deploy4"/>
+<break lines="1" section="etsy_deploy5"/>
 <example fontsize="1.1em" result='0' title="" type="shell nohighlight"><![CDATA[
 Channel: #push Topic: <prod> bob Rasmus
 devbot: Swapping symlinks. Your code is about to start taking production traffic
@@ -69,7 +81,7 @@ pushbot: clear
 *** pushbot has changed the topic on #push to clear
 ]]></example>
 
-<break lines="1" section="etsy_deploy5"/>
+<break lines="1" section="etsy_deploy6"/>
 <blurb fontsize="2.5em" align="left">Graph Everything!</blurb>
 <list>
 <bullet fontsize="2em" align="left">Statsd</bullet>
@@ -77,7 +89,7 @@ pushbot: clear
 <bullet fontsize="2em" align="left">Graphite</bullet>
 </list>
 
-<break lines="1" section="etsy_deploy6"/>
+<break lines="1" section="etsy_deploy7"/>
 <blurb fontsize="2.5em" align="left">Log Everything!</blurb>
 <list>
 <bullet fontsize="2em" align="left">logster</bullet>
@@ -86,7 +98,7 @@ pushbot: clear
 <bullet fontsize="2em" align="left">Elastic Search</bullet>
 </list>
 
-<break lines="1" section="etsy_deploy7"/>
+<break lines="1" section="etsy_deploy8"/>
 <list>
 <bullet fontsize="1.5em" align="left">Commit to master</bullet>
 <bullet fontsize="1.5em" align="left">Deploy from HEAD</bullet>
@@ -94,10 +106,10 @@ pushbot: clear
 <bullet fontsize="1.5em" align="left">Branches are in code via feature flags</bullet>
 </list>
 
-<break lines="1" section="etsy_deploy8"/>
+<break lines="1" section="etsy_deploy9"/>
 <blurb fontsize="2.5em" align="left">Blameless post-mortems</blurb>
 
-<break lines="1" section="etsy_deploy9"/>
+<break lines="1" section="etsy_deploy10"/>
 <link fontsize="1.2em" align="left" marginleft="2em" href="https://github.com/etsy/deployinator">github.com/etsy/deployinator</link>
 <link fontsize="1.2em" align="left" marginleft="2em" href="https://github.com/etsy/statsd">github.com/etsy/statsd</link>
 <link fontsize="1.2em" align="left" marginleft="2em" href="https://github.com/etsy/logster">github.com/etsy/logster</link>
diff --git a/slides/intro/fr-peace-black.png b/slides/intro/fr-peace-black.png
new file mode 100644
index 0000000..1481867
Binary files /dev/null and b/slides/intro/fr-peace-black.png differ
diff --git a/slides/intro/merci.xml b/slides/intro/merci.xml
new file mode 100644
index 0000000..46e6d76
--- /dev/null
+++ b/slides/intro/merci.xml
@@ -0,0 +1,4 @@
+<slide title="" body_style="background:#000000;">
+<blurb fontsize="20em" align="center">|FFFFFF|Merci AFUP!|</blurb>
+<image width="640" height="550" filename="fr-peace-black.png" align="center"/>
+</slide>
diff --git a/slides/intro/php7_2016.xml b/slides/intro/php7_2016.xml
index 603bb0b..4551686 100644
--- a/slides/intro/php7_2016.xml
+++ b/slides/intro/php7_2016.xml
@@ -511,8 +511,19 @@ echo "\u{1F602}";
 
 <blurb fontsize="1.1em" align="left">✔ ICU IntlChar class added to intl extension</blurb>
 
+<break lines="1" section="php7csprng"/>
+<blurb fontsize="1.1em" align="left">✔ CSPRNG</blurb>
+<example fontsize="1.2em" result='1' title=""><![CDATA[
+<?php
+$int   = random_int(-500, 500);
+$bytes = random_bytes(10);
+
+var_dump( $int );
+var_dump( bin2hex($bytes) );
+]]></example>
+
 <break lines="1" section="php7more"/>
 
-<blurb fontsize="1.5em">GA release scheduled for Nov.26 or Dec.12</blurb>
+<blurb fontsize="1.5em">GA release scheduled for Nov.26 or Dec.3</blurb>
 
 </slide>