From 9c2b9b83507e92017197253e9d85c52ce1086d63 Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Solà Date: Sat, 3 Oct 2020 19:26:25 +0200 Subject: script: updated main branch to 'main' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miquel Sabaté Solà --- Dockerfile | 6 +++--- Gemfile | 2 +- Gemfile.lock | 2 +- _i18n/ca/license.md | 4 ++-- script/post-receive | 4 ++-- writings.md | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 647a07e..362a9d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -FROM opensuse/leap:15.0 +FROM opensuse/leap:15.1 MAINTAINER Miquel Sabaté Solà RUN useradd --no-create-home --shell /dev/null --system nobody && \ - zypper ar -f -G obs://home:/mssola/openSUSE_Leap_42.3/ home:mssola && \ - zypper ar -f -G obs://devel:/languages:/nodejs/openSUSE_Leap_15.0/ devel:languages:nodejs && \ + zypper ar -f -G obs://home:/mssola/openSUSE_Leap_15.2/ home:mssola && \ + zypper ar -f -G obs://devel:/languages:/nodejs/openSUSE_Leap_15.2/ devel:languages:nodejs && \ zypper ref && \ zypper -n in -t pattern devel_basis && \ zypper -n in nodejs10 npm10 ruby2.5-devel ruby2.5-rubygem-bundler libxslt-devel gcc-c++ glibc-locale git-core && \ diff --git a/Gemfile b/Gemfile index 4f5d10c..4e4636b 100644 --- a/Gemfile +++ b/Gemfile @@ -20,10 +20,10 @@ source "https://rubygems.org" gem "html-proofer" gem "jekyll", "~> 3.9.0" gem "jemoji" +gem "kramdown-parser-gfm" gem "rake" gem "rubocop" gem "sass" -gem "kramdown-parser-gfm" group :jekyll_plugins do gem "jekyll-multiple-languages-plugin" diff --git a/Gemfile.lock b/Gemfile.lock index 766543e..5fc095f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,4 +125,4 @@ DEPENDENCIES sass BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/_i18n/ca/license.md b/_i18n/ca/license.md index 120fd4c..2a65136 100644 --- a/_i18n/ca/license.md +++ b/_i18n/ca/license.md @@ -6,7 +6,7 @@ sentit. El codi font es pot trobar [aquí](http://git.mssola.com/jo.git/). ## Llicència
-
+  
 Copyright (C) 2018-2020 Miquel Sabaté Solà <mikisabate@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@ GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
-

+
## Creative Commons diff --git a/script/post-receive b/script/post-receive index c8ed170..7c9edca 100644 --- a/script/post-receive +++ b/script/post-receive @@ -20,7 +20,7 @@ NAME=jo GIT_REPO=$HOME/$NAME.git -TARGET_BRANCH=master +TARGET_BRANCH=main # Exported so it's picked by the `script/docker-build.sh` script. export BUILD_SOURCE=$HOME/tmp/$NAME @@ -34,7 +34,7 @@ do # Re-generate git repository in a temporary directory. rm -Rf $BUILD_SOURCE - git clone $GIT_REPO $BUILD_SOURCE + git clone --branch $TARGET_BRANCH $GIT_REPO $BUILD_SOURCE # Build site chmod +x $BUILD_SOURCE/script/docker-build.sh diff --git a/writings.md b/writings.md index 3f0d769..df2ac3e 100644 --- a/writings.md +++ b/writings.md @@ -11,6 +11,6 @@ permalink_en: /writings/

{% t writings.summaries %}

{% t writings.summaries_intro %}

-- cgit v1.2.3