From e414adecc96f9020357302af208acec89da8baa4 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Mon, 27 Aug 2018 18:39:13 +0300 Subject: [PATCH 01/10] Update the travis build to work in stages (#948) * Update the travis build to work in stages * Intentional "Build website" error * Intentional "Lint" error * Restore CI test errors * Conditional deplay stage, only on master So PRs targetting develop don't run an empty stage. Related Travis Documentation: https://docs.travis-ci.com/user/conditional-builds-stages-jobs/ --- .travis.yml | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf08e041..15268853 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,25 @@ -matrix: +jobs: include: - - language: node_js - node_js: - - "8" - + - stage: "Test" + name: "Lint" + language: node_js + node_js: 8 script: - npm run jsonlint - npm run svglint + - name: "Build website" + language: ruby + rvm: 2.4.1 + install: + - gem install jekyll + script: + - jekyll build - notifications: - email: - on_success: never - on_failure: change + - stage: deploy + name: "NPM Package" + language: node_js + node_js: 8 + if: branch = master deploy: provider: npm @@ -20,17 +28,7 @@ matrix: on: branch: master - - language: ruby - rvm: - - 2.4.1 - - install: - - gem install jekyll - - script: - - jekyll build - - notifications: - email: - on_success: never - on_failure: change +notifications: + email: + on_success: never + on_failure: change From 8f738ed8e68d060264622e54540d0a7726545dc7 Mon Sep 17 00:00:00 2001 From: Metaa Date: Mon, 27 Aug 2018 23:37:31 +0200 Subject: [PATCH 02/10] Add ESLint (#950) * Add ESLint * Remove group from the ESLint icon. --- _data/simple-icons.json | 5 +++++ icons/eslint.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/eslint.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 571fc8d6..e11ab5c0 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -485,6 +485,11 @@ "hex": "81B441", "source": "https://envato.com/" }, + { + "title": "ESLint", + "hex": "4B32C3", + "source": "https://eslint.org/img/logo.svg" + }, { "title": "Ethereum", "hex": "3C3C3D", diff --git a/icons/eslint.svg b/icons/eslint.svg new file mode 100644 index 00000000..d61161e5 --- /dev/null +++ b/icons/eslint.svg @@ -0,0 +1 @@ +ESLint icon From 52d99069334ee8bd5ea29992e3992d1e5438a5a6 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Wed, 29 Aug 2018 16:07:49 +0300 Subject: [PATCH 03/10] Add Lua (#952) * Add Lua icon SVG SVG version of the icon taken from WikiMedia: https://commons.wikimedia.org/wiki/File:Lua-logo-nolabel.svg * Add Lua icon details URL links to the documentation of the Lua language, where a clean unanimated version of their logo can be found (the logo on the homepage is animated). The color comes from the SVG found on WikiMedia: https://commons.wikimedia.org/wiki/File:Lua-logo-nolabel.svg --- _data/simple-icons.json | 5 +++++ icons/lua.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/lua.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index e11ab5c0..1a87b14d 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1030,6 +1030,11 @@ "hex": "CF202E", "source": "https://livestream.com/press" }, + { + "title": "Lua", + "hex": "2C2D72", + "source": "https://www.lua.org/docs.html" + }, { "title": "Macy’s", "hex": "E21A2C", diff --git a/icons/lua.svg b/icons/lua.svg new file mode 100644 index 00000000..80b17775 --- /dev/null +++ b/icons/lua.svg @@ -0,0 +1 @@ +Lua icon \ No newline at end of file From c45f4513f64645af1a45dcd2ae457614397cdf63 Mon Sep 17 00:00:00 2001 From: Johan Fagerberg Date: Wed, 29 Aug 2018 15:16:57 +0200 Subject: [PATCH 04/10] Add Archive of Our Own (#939) --- _data/simple-icons.json | 5 +++++ icons/archiveofourown.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/archiveofourown.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 1a87b14d..3e4eea6f 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -130,6 +130,11 @@ "hex": "1793D1", "source": "https://www.archlinux.org/art/" }, + { + "title": "Archive of Our Own", + "hex": "990000", + "source": "https://archiveofourown.org/" + }, { "title": "ArtStation", "hex": "13AFF0", diff --git a/icons/archiveofourown.svg b/icons/archiveofourown.svg new file mode 100644 index 00000000..f0cf2170 --- /dev/null +++ b/icons/archiveofourown.svg @@ -0,0 +1 @@ +Archive of Our Own icon \ No newline at end of file From f9b7a0e1a2ef9b6b522448a5baa89550d3186740 Mon Sep 17 00:00:00 2001 From: Johan Fagerberg Date: Wed, 29 Aug 2018 15:23:19 +0200 Subject: [PATCH 05/10] Add Qzone (#940) --- _data/simple-icons.json | 5 +++++ icons/qzone.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/qzone.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 3e4eea6f..a14fc5b5 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1475,6 +1475,11 @@ "hex": "B92B27", "source": "https://www.quora.com" }, + { + "title": "Qzone", + "hex": "FECE00", + "source": "https://qzone.qq.com/" + }, { "title": "Rails", "hex": "CC0000", diff --git a/icons/qzone.svg b/icons/qzone.svg new file mode 100644 index 00000000..5b5fe6ef --- /dev/null +++ b/icons/qzone.svg @@ -0,0 +1 @@ +Qzone icon \ No newline at end of file From 03e6193164f0cdd2cf22c8447a921c3a7ff02f35 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Wed, 29 Aug 2018 17:49:30 +0300 Subject: [PATCH 06/10] Add CoffeeScript (#953) * Add CoffeeScript icon SVG As found on their homepage: https://coffeescript.org/ * Add CoffeeScript icon details The color is taken from the navigation bar of their website (