Skip to content

Commit fd40fa9

Browse files
john-b-yangjohn-b-yang
committed
deploy: 090caf0 
1 parent 2dc1591 commit fd40fa9

8 files changed

Lines changed: 226 additions & 143 deletions

File tree

‎reference/arenas/robocode/index.html‎

Lines changed: 30 additions & 26 deletions
Large diffs are not rendered by default.

‎reference/player/dummy/index.html‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,18 @@ <h2 id="codeclash.agents.dummy_agent.Dummy" class="doc doc-heading">
18051805
<span class="normal">85</span>
18061806
<span class="normal">86</span>
18071807
<span class="normal">87</span>
1808-
<span class="normal">88</span></pre></div></td><td class="code"><div><pre><span></span><code><span class="k">def</span><span class="w"> </span><span class="fm">__init__</span><span class="p">(</span>
1808+
<span class="normal">88</span>
1809+
<span class="normal">89</span>
1810+
<span class="normal">90</span>
1811+
<span class="normal">91</span>
1812+
<span class="normal">92</span>
1813+
<span class="normal">93</span>
1814+
<span class="normal">94</span>
1815+
<span class="normal">95</span>
1816+
<span class="normal">96</span>
1817+
<span class="normal">97</span>
1818+
<span class="normal">98</span>
1819+
<span class="normal">99</span></pre></div></td><td class="code"><div><pre><span></span><code><span class="k">def</span><span class="w"> </span><span class="fm">__init__</span><span class="p">(</span>
18091820
<span class="bp">self</span><span class="p">,</span>
18101821
<span class="n">config</span><span class="p">:</span> <span class="nb">dict</span><span class="p">,</span>
18111822
<span class="n">environment</span><span class="p">:</span> <span class="n">DockerEnvironment</span><span class="p">,</span>
@@ -1866,12 +1877,23 @@ <h2 id="codeclash.agents.dummy_agent.Dummy" class="doc doc-heading">
18661877
<span class="n">logger</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="p">,</span>
18671878
<span class="p">)</span>
18681879
<span class="k">else</span><span class="p">:</span>
1869-
<span class="c1"># Resume the branch if a previous round pushed it to the remote, else create it.</span>
1880+
<span class="c1"># Resume the branch if a previous rung/round pushed it to the remote, else create it.</span>
1881+
<span class="c1"># Reset the local branch to the fetched remote tip with -B.</span>
18701882
<span class="n">assert_zero_exit_code</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">environment</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="s2">&quot;git fetch origin&quot;</span><span class="p">),</span> <span class="n">logger</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="p">)</span>
1871-
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">environment</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;git checkout </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_branch_name</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;returncode&quot;</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">:</span>
1872-
<span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Branch </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_branch_name</span><span class="si">}</span><span class="s2"> doesn&#39;t exist, creating it&quot;</span><span class="p">)</span>
1883+
<span class="k">if</span> <span class="p">(</span>
1884+
<span class="bp">self</span><span class="o">.</span><span class="n">environment</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;git rev-parse --verify --quiet origin/</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_branch_name</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span><span class="o">.</span><span class="n">get</span><span class="p">(</span>
1885+
<span class="s2">&quot;returncode&quot;</span><span class="p">,</span> <span class="mi">1</span>
1886+
<span class="p">)</span>
1887+
<span class="o">==</span> <span class="mi">0</span>
1888+
<span class="p">):</span>
1889+
<span class="n">assert_zero_exit_code</span><span class="p">(</span>
1890+
<span class="bp">self</span><span class="o">.</span><span class="n">environment</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;git checkout -B </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_branch_name</span><span class="si">}</span><span class="s2"> origin/</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_branch_name</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">),</span>
1891+
<span class="n">logger</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="p">,</span>
1892+
<span class="p">)</span>
1893+
<span class="k">else</span><span class="p">:</span>
1894+
<span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;Branch </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_branch_name</span><span class="si">}</span><span class="s2"> doesn&#39;t exist on remote, creating it&quot;</span><span class="p">)</span>
18731895
<span class="n">assert_zero_exit_code</span><span class="p">(</span>
1874-
<span class="bp">self</span><span class="o">.</span><span class="n">environment</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;git checkout -b </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_branch_name</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">),</span>
1896+
<span class="bp">self</span><span class="o">.</span><span class="n">environment</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;git checkout -B </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_branch_name</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">),</span>
18751897
<span class="n">logger</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">logger</span><span class="p">,</span>
18761898
<span class="p">)</span>
18771899
</code></pre></div></td></tr></table></div>

0 commit comments

Comments
 (0)