Skip to content

Commit 928e8cc

Browse files
committed
Merge #812: Replace travis by cirrus CI
90f4dbc ci: Add cirrus configuration (W. J. van der Laan) d8cf16b Site fixes to pass tests (W. J. van der Laan) 0e6abd5 ci: Remove travis configuration (W. J. van der Laan) Pull request description: Attempt at #811. Loosely based on the [Ruby example](https://cirrus-ci.org/examples/#ruby) in the documentation, as well as the old Travis config. ACKs for top commit: harding: Tested ACK 90f4dbc . Previewed the modified Download page; there's a slight change in rendering due to the removal of the `<pre>` tag. I'm surprised that needed to be removed, but the difference is fine. Tree-SHA512: 9048d2854574efa19a36d4dc04019b17ce53c8ac03513a1fa78323f458f4ee54c036c982504f1e314829fe35e520ed88e4c675f6367587d3ad2c5bfa1b73870f
2 parents bf3e412 + 90f4dbc commit 928e8cc

File tree

4 files changed

+24
-40
lines changed

4 files changed

+24
-40
lines changed

.cirrus.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
container:
2+
image: ruby:2.5.5
3+
4+
task:
5+
name: website
6+
env:
7+
JEKYLL_ENV: production
8+
NOKOGIRI_USE_SYSTEM_LIBRARIES: true # speeds up installation of html-proofer
9+
RUBYOPT: "-KU -E utf-8:utf-8"
10+
11+
bootstrap_script: gem install bundler
12+
bundler_cache:
13+
folder: /usr/local/bundle
14+
fingerprint_script:
15+
- echo $RUBY_VERSION
16+
- cat Gemfile.lock
17+
populate_script: bundle install
18+
19+
build_and_test_script: make all

.travis.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

_includes/templates/download.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ <h2 style="text-align: center">{{ page.verify_title }}</h2>
116116

117117
{% if page.version > 4 %}
118118
<h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.verify_download}}</h2>
119-
<p>{{page.verification_recommended}}</p>
119+
{{page.verification_recommended}}
120120
<details>
121121
{% assign GPG = "C:\Program Files\Gnu\GnuPg\gpg.exe" %}
122122
<summary><strong>{{page.windows_instructions}}</strong></summary>
@@ -147,7 +147,7 @@ <h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.ve
147147
{{page.gpg_download_other}}
148148
<a href="{{GPG_DOWNLOAD_URL}}">{{page.gpg_download_options}}</a></p></li>
149149

150-
<li><p>{{OBTAIN_RELEASE_KEY}}</p>
150+
<li>{{OBTAIN_RELEASE_KEY}}
151151

152152
<pre class="highlight"><code>{{GPG}}{{site.strings.gpg_keyserver}} --recv-keys {{example_builder_key}}</code></pre>
153153

@@ -195,7 +195,7 @@ <h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.ve
195195
{{page.gpg_download_other}}
196196
<a href="{{GPG_DOWNLOAD_URL}}">{{page.gpg_download_options}}</a></p></li>
197197

198-
<li><p>{{OBTAIN_RELEASE_KEY}}</p>
198+
<li>{{OBTAIN_RELEASE_KEY}}
199199

200200
<pre class="highlight"><code>gpg{{site.strings.gpg_keyserver}} --recv-keys {{example_builder_key}}</code></pre>
201201

@@ -237,7 +237,7 @@ <h2 style="text-align: center" id="{{page.verify_download | slugify}}">{{page.ve
237237

238238
<p>{{page.checksum_warning_and_ok | replace, "$(SHASUMS_OK)", page.localized_checksum_ok}} <code>{{FILE_PREFIX}}-{{site.data.binaries.lin64}}: {{page.localized_checksum_ok}}</code></p></li>
239239

240-
<li><p>{{OBTAIN_RELEASE_KEY}}</p>
240+
<li>{{OBTAIN_RELEASE_KEY}}
241241

242242
<pre class="highlight"><code>gpg{{site.strings.gpg_keyserver}} --recv-keys {{example_builder_key}}</code></pre>
243243

_posts/en/pages/2017-01-01-download.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ obtain_release_key: >
9191
9292
<p>For example, given the <a href='$(BUILDER_KEYS_TXT_URL)'><code>
9393
builders-key/keys.txt</code></a> line
94-
<pre class='highlight'><code>$(EXAMPLE_BUILDERS_LINE)</code></pre>you could load that
94+
<code>$(EXAMPLE_BUILDERS_LINE)</code>you could load that
9595
key using this command:</p>
9696
9797
choosing_builders: >

0 commit comments

Comments
 (0)