From 13c23f864ea0192ac4a2aa9ddbe4c083c22bcd7a Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Tue, 11 Jan 2022 06:09:20 +0100 Subject: [PATCH] Add automatic uploading and fix gemfile --- .vscode/tasks.json | 70 +++++++++++++++++++++++++++------------------- Gemfile.lock | 4 +-- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 22569c2..6135607 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,35 +4,7 @@ "version": "2.0.0", "tasks": [ { - "label": "Build (Release)", - "type": "shell", - "command": "bundle", - "args": [ - "exec", - "jekyll", - "build", - "--destination", - "build" - ], - "group": "build" - }, - { - "label": "Build (Development)", - "type": "shell", - "command": "bundle", - "args": [ - "exec", - "jekyll", - "build", - "--trace", - "--future", - "--unpublished", - "--drafts" - ], - "group": "build" - }, - { - "label": "Serve (Development)", + "label": "Serve", "type": "shell", "command": "bundle", "args": [ @@ -48,6 +20,46 @@ ], "group": "none", "problemMatcher": [] + }, + { + "label": "Build", + "type": "shell", + "command": "bundle", + "args": [ + "exec", + "jekyll", + "build", + "--destination", + "build" + ], + "group": "build", + "problemMatcher": [] + }, + { + "label": "Upload", + "type": "process", + "options": { + "cwd": "build", + }, + "command": "wsl", + "args": [ + "-e", + "/usr/bin/rsync", + "-v", + "-P", + "-a", + "--delete", + ".", + "www-data@web.svc.xaymar.com:/var/www/com.xaymar.www/" + ], + "group": "build", + "problemMatcher": [] + }, + { + "label": "Build & Upload", + "dependsOn": [ "Build", "Upload" ], + "group": "build", + "problemMatcher": [] } ] } diff --git a/Gemfile.lock b/Gemfile.lock index 561e2ae..0113ba1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,7 @@ GEM em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) - ffi (1.15.4-x64-mingw32) + ffi (1.15.5-x64-mingw32) forwardable-extended (2.6.0) http_parser.rb (0.8.0) i18n (1.8.11) @@ -35,7 +35,7 @@ GEM rouge (~> 3.0) safe_yaml (~> 1.0) terminal-table (~> 2.0) - jekyll-feed (0.15.1) + jekyll-feed (0.16.0) jekyll (>= 3.7, < 5.0) jekyll-paginate-v2 (3.0.0) jekyll (>= 3.0, < 5.0)