Commit Graph

149 Commits

Author SHA1 Message Date
James Mead a696edb49c Use branch of jekyll-sass-converter to fix deprecation warning
This fixes the deprecation warning (see below) which appears on running
a fresh `bundle install`. This branch contains the changes described in
this PR [1]. The only outstanding problems seem to be Windows-related,
so I think it's safe to use it.

We should be able to switch back to the release version (required by
default by the jekyll gem) when this PR is merged and released.

    Ruby Sass is deprecated and will be unmaintained as of 26 March 2019.

    * If you use Sass as a command-line tool, we recommend using Dart Sass, the new
      primary implementation: https://sass-lang.com/install

    * If you use Sass as a plug-in for a Ruby web framework, we recommend using the
      sassc gem: https://github.com/sass/sassc-ruby#readme

    * For more details, please refer to the Sass blog:
      http://sass.logdown.com/posts/7081811

[1]: https://github.com/jekyll/jekyll-sass-converter/pull/75
2018-11-22 21:10:22 +00:00
Chris Lowis 05ecdd50bf Remove placeholder text 2018-11-20 22:10:29 +00:00
Chris Lowis 868aa2fb01 Depend on jekyll gem instead of github-pages
I don't think we need everything that github-pages pulls in, and this
should speed up the build.
2018-11-20 22:09:51 +00:00
Chris Croome 26a10700a7 Metadata added to <head> and footer updated 2018-11-18 18:43:07 +00:00
Chris Croome 92b1459724 Add back necessary eval $(ssh-agent -s) 2018-11-18 16:07:00 +00:00
Chris Croome e35afc0dcd CI tweaks to make it less verbose 2018-11-18 16:05:08 +00:00
Chris Croome 0893e88391 Remove hello world test from .gitlab-ci.yml 2018-11-18 15:34:17 +00:00
Chris Croome 37a971b308 README updated to trigger CI 2018-11-18 15:25:52 +00:00
Chris Croome 7ee0f5bf24 Added hello world test 2018-11-18 15:17:01 +00:00
Chris Lowis e733ed08e8 Install rsync on CI 2018-11-13 21:55:17 +00:00
Chris Lowis 97667077e1 Attempt to deploy site
@chris has setup a server[1] and added the public half of a key pair
generated using `ssh-keygen -o -t rsa -b 4096` as per the instructions
on docs.gitlab.com[2].

The `before_script` was taken from the same instructions. I set the
two variables SSH_PRIVATE_KEY and SSH_KNOWN_HOSTS in the CI/CD
settings[3].

To see if this works I'm calling `rsync` in the `script` section of
the deploy stage, using the dry-run option, `-n`.

[1] https://git.coop/cotech/website/issues/4#note_9890
[2] https://docs.gitlab.com/ee/ci/ssh_keys/#ssh-keys-when-using-the-docker-executor
[3] https://git.coop/cotech/website/settings/ci_cd
2018-11-13 20:19:19 +00:00
Chris Lowis b8625a7e66 Update README.md
I've added some installation instructions and moved the improvements
that haven't been done to issues in gitlab[1].

[1] https://git.coop/cotech/website/issues
2018-11-12 21:29:02 +00:00
Chris Lowis 8ed88952dc Fix client name under logo on co-op pages
The data files under _clients use 'title' instead of 'name'.
2018-11-11 21:20:38 +00:00
Chris Lowis e8ff6e7499 Fix invalid YAML in _clients/now-pensions.md 2018-11-11 21:15:46 +00:00
Chris Lowis e2923ac8e0 Convert all client images to png 2018-11-11 21:14:42 +00:00
Chris Lowis 3c1edd2c19 Migrate existing clients to jekyll site
I ran `migrate_clients.rb`.
2018-11-11 21:12:34 +00:00
Chris Lowis 146177184c Add script to migrate clients from wordpress mirror
This script iterates over all of the coops to pull their clients from
the individual co-op pages, normalises the filenames of the images and
creates an entry under `_clients`.
2018-11-11 21:11:19 +00:00
Chris Lowis b41eb0f80e Add rubygems source to scripts Gemfile 2018-11-11 21:11:00 +00:00
Chris Lowis 48d40e6ad1 Fix ruby version to 2.5.3
This is the latest stable version of ruby.
2018-11-10 22:51:01 +00:00
Chris Lowis d7c5ca4cad Add a .gitlab-ci.yml
Following the instructions[1] for building a jekyll site in gitlab,
I've added this file. Let's see if it works!

[1] https://gitlab.com/pages/jekyll
2018-11-10 22:26:23 +00:00
Chris Lowis af3b0da124 Remove deprecation warning 2018-11-10 22:18:40 +00:00
Chris Lowis d2fc574445 Convert all service logos to png
Some of the service logos were in jpg or gif format. For
consistency, and to make page generation simpler, this commit converts
them to png format.
2018-11-10 22:09:38 +00:00
Chris Lowis 8284159c04 Migrate services from old site
Ran the `migrate_services` script.
2018-11-10 22:08:20 +00:00
Chris Lowis 0e6c62df0d Add script to migrate services from old site
This script copies the service logos, normalises the file names and
creates a corresponding entry in `_services`.
2018-11-10 22:07:32 +00:00
Chris Lowis 71afa7f0e5 Convert all technology logos to png
Some of the technology logos were in jpg or gif format. For
consistency, and to make page generation simpler, this commit converts
them to png format.
2018-11-10 21:59:37 +00:00
Chris Lowis d9989ec794 Migrate technologies from old site
Ran the `migrate_technologies` script.
2018-11-10 21:53:06 +00:00
Chris Lowis db17505a9b Add script to migrate technologies from old site
This script copies the technology logos, normalises the file names and
creates a corresponding entry in `_technologies`.
2018-11-10 21:52:17 +00:00
Chris Lowis 396589820a Fix members grid on homepage
We needed to add a "column" div for each thumbnail.
2018-11-10 21:23:50 +00:00
Chris Lowis d7965c9a79 Fix twitter link and quote : in dev-the-developers-society.md 2018-11-10 21:21:18 +00:00
Chris Lowis 622dac7193 Fix twitter link in cbn.md 2018-11-10 21:20:59 +00:00
Chris Lowis 54a2d68952 Migrate co-op pages from old site
I ran `ruby migrate_coop_pages.rb` in `scripts`. There will need to be
some manual tidying up of the generated `.md` files under `_coops` but
I think this is a good start. As a one-off it doesn't warrant the time
it would take to improve the migration script.
2018-11-10 21:16:42 +00:00
Chris Lowis a08b88f85a Convert co-op images to png format
It makes it easier to generate the templates if we have a consistent
file format for images. I've chosen png as most of the other co-op
logos are in png.
2018-11-10 21:10:34 +00:00
Chris Lowis 09d4895994 Exclude scripts directory when building site 2018-11-10 21:10:18 +00:00
Chris Lowis 11b3f3bdb3 Add missing co-op logos
I ran `scripts/migrate_coop_logos.rb` to migrate the logos from the
static mirror to jekyll. The script renamed the files in a consistent
way.
2018-11-09 21:51:28 +00:00
Chris Lowis 986b76fe43 Add script to migrate co-op logos 2018-11-09 21:50:57 +00:00
Chris Lowis a453d287ce Extract Coop class into its own file 2018-11-09 20:58:42 +00:00
Chris Lowis 23251e7ba2 Add Coop.all method to return all co-ops for migration 2018-11-09 20:56:26 +00:00
Chris Lowis 5ca9d98343 Add a script for generating coop data from coops.tech mirror 2018-11-09 16:02:15 +00:00
Chris Lowis 40f7f42ec2 Update github-pages 140 -> 192
I ran `bundle update github-pages` in order to resolve security alerts
for jekyll[1] and ffi[2].

[1]
https://github.com/freerange/cotech-website/network/alert/Gemfile.lock/jekyll/open
[2] https://github.com/freerange/cotech-website/network/alert/Gemfile.lock/ffi/open
2018-11-05 21:02:29 +00:00
Chris Lowis bff92115f6 Update nokogiri 1.8.0 -> 1.8.5
I ran `bundle update nokogiri` to patch CVE-2017-9050[1] in libxml2.

[1] https://nvd.nist.gov/vuln/detail/CVE-2017-9050
2018-11-05 20:45:24 +00:00
James Mead 89bfc9b4b9
Add deprecation notice to README
In preparation for archiving repo.
2018-03-31 12:02:00 +01:00
gfr-cloudcannon 417d857a65 Updated About 2017-07-06 10:55:00 +01:00
gfr-cloudcannon 198d5625e8 Updated Agile Collective 2017-07-05 20:57:54 +01:00
gfr-cloudcannon 7606bf537d Added Devops 2017-07-05 20:57:24 +01:00
gfr-cloudcannon 1a1a947785 Updated About 2017-07-05 20:53:33 +01:00
gfr-cloudcannon 027dd55da4 Updated About 2017-07-05 20:51:16 +01:00
accounts+gfr-siteleaf@gofreerange.com d38667768c Updated Go Free Range 2017-07-05 20:43:23 +01:00
accounts+gfr-siteleaf@gofreerange.com af5e7f3ee2 Updated Go Free Range 2017-07-05 20:42:46 +01:00
Siteleaf 71be497ac6 Updated Config and 19 other files 2017-07-05 20:36:03 +01:00
GFR CloudCannon 066a6c2e30 Updated '_coops/agile-collective.md' via CloudCannon 2017-07-04 19:18:32 +00:00