autonomic-cooperative/autonomic.zone
Archived
5
0
Fork 0
Code Issues 15 Pull Requests 2 Releases Activity

Upgrade us to Ruby 2.6.5 & Jekyll 4

Browse Source
This commit is contained in:
Anna Sidwell 2019-11-14 14:07:17 +00:00
parent 4dff7a9a12
commit b29e79f493
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTING.md
View File

@ -21,13 +21,13 @@ advised that you use [RVM](https://rvm.io/rvm/install).
Once you've got that installed and configured, get the latest version of Ruby with: Once you've got that installed and configured, get the latest version of Ruby with:
```bash ```bash
$ rvm install 2.4.9 $ rvm install 2.6.5
``` ```
Select that version and then create an isolated [gemset](https://rvm.io/gemsets/basics) with: Select that version and then create an isolated [gemset](https://rvm.io/gemsets/basics) with:
```bash ```bash
$ rvm use 2.4.9 $ rvm use 2.6.5
$ rvm gemset create autonomic $ rvm gemset create autonomic
$ rvm gemset use autonomic $ rvm gemset use autonomic
``` ```
@ -58,7 +58,7 @@ Edit content in the `.md` files under `src` and `src/_posts`.
When you're hacking later on (or in a new shell), you'll need to run: When you're hacking later on (or in a new shell), you'll need to run:
``` bash ``` bash
$ rvm use 2.4.8 $ rvm use 2.6.5
$ rvm gemset use autonomic $ rvm gemset use autonomic
``` ```

4
README.md
View File

@ -4,7 +4,7 @@
A [Jekyll] based site for the Autonomic Cooperative. The site is based on the [spectral-jekyll-theme] template. A [Jekyll] based site for the Autonomic Cooperative. The site is based on the [spectral-jekyll-theme] template.
We use [autonomic.zone] for production. We used to use [autonomic-cooperative.gitlab.io] as staging but this isn't really needed anymore. master is served up to [autonomic.zone] and [autonomic-cooperative.gitlab.io].
[Jekyll]: https://jekyllrb.com/ [Jekyll]: https://jekyllrb.com/
[spectral-jekyll-theme]: https://github.com/andrewbanchich/spectral-jekyll-theme [spectral-jekyll-theme]: https://github.com/andrewbanchich/spectral-jekyll-theme
@ -13,7 +13,7 @@ We use [autonomic.zone] for production. We used to use [autonomic-cooperative.gi
# Make a change # Make a change
Work on features in branches. If you commit to master, open a merge request from your branch unless it is a tiny change. Our [deploy] CI stage will push any changes on master branch to [autonomic.zone]. Work on features in branches. If you commit to master, open a merge request from your branch unless it is a tiny change. Our [pages] CI stage will push any changes on master branch to [autonomic.zone].
[deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17 [deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17

2
autonomic.gemspec
View File

@ -10,6 +10,6 @@ Gem::Specification.new do |spec|
spec.email = 'autonomic.posteo.net' spec.email = 'autonomic.posteo.net'
spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) } spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) }
spec.add_development_dependency "jekyll", ">= 3.3" spec.add_development_dependency "jekyll", ">= 4"
spec.add_development_dependency "bundler", ">= 1.12" spec.add_development_dependency "bundler", ">= 1.12"
end end