diff options
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | _i18n/ca/license.md | 4 | ||||
| -rw-r--r-- | script/post-receive | 4 | ||||
| -rw-r--r-- | writings.md | 2 |
6 files changed, 10 insertions, 10 deletions
@@ -13,12 +13,12 @@ # 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/>. -FROM opensuse/leap:15.0 +FROM opensuse/leap:15.1 MAINTAINER Miquel Sabaté Solà <mikisabate@gmail.com> 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 && \ @@ -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 <div class="org-src-container"> -<pre class="src src-txt"> + <pre class="src src-txt"> 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/>. -</pre> + </pre> </div> ## 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/ <h2>{% t writings.summaries %}</h2> <p>{% t writings.summaries_intro %}</p> <ul> - <li>{% t writings.summaries_republic %}: <a href="https://cloud.mssola.com/s/jW4ntx2r6WMmt8g/download" title="{% t writings.summaries_republic_cloud_title %}">{% t writings.summaries_republic_cloud_text %}</a> + <a href="https://twitter.com/miquelssola/status/1241826145542299651" title="{% t writings.summaries_republic_twitter_title %}">{% t writings.summaries_republic_twitter_text %}</a>.</li> + <li>{% t writings.summaries_republic %}: <a href="https://cloud.mssola.com/s/ByDa2sFWZPqzDTK/download" title="{% t writings.summaries_republic_cloud_title %}">{% t writings.summaries_republic_cloud_text %}</a> + <a href="https://twitter.com/miquelssola/status/1241826145542299651" title="{% t writings.summaries_republic_twitter_title %}">{% t writings.summaries_republic_twitter_text %}</a>.</li> </ul> </div> |