### Steps to release
-During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`.
+During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (like 2.3.4).
#### Files to edit
```diff
script:
-- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
-+ - travis_wait composer update --no-interaction --no-progress
+- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
++ - travis_wait bash composer update -o --no-interaction --no-progress --prefer-dist
```
- Then continue with these commands:
- Run these command to create the package:
```
-make release master /tmp wllbg-release prod
+make release VERSION=$LAST_WALLABAG_RELEASE
```
-- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package.
-- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**).
+- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `release-$LAST_WALLABAG_RELEASE` branch. You have to upload the package (generated previously).
+- Close the previously created pull request (**DO NOT MERGE IT**) and delete the `release-$LAST_WALLABAG_RELEASE` branch.
- Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
-- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
- Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
-- Update wallabag.org website (downloads, releases and new blog post)
+- Update wallabag.org website (downloads, MD5 sum, releases and new blog post)
- Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`)
- Drink a :beer:!
height: 13.5em;
}
- .card-image .preview,
- .card-fullimage .preview {
- height: 100%;
- background: no-repeat 50%/cover;
- background-color: #efefef;
- display: block;
-
- &--default {
- background-size: contain;
- }
- }
-
&.sw {
max-width: 370px;
margin-left: auto;
display: block;
}
+.card .card-image .preview,
+.card .card-fullimage .preview,
+.card-stacked .preview {
+ height: 100%;
+ background: no-repeat 50%/cover;
+ background-color: #efefef;
+ display: block;
+
+ &--default {
+ background-size: contain;
+ }
+}
+
.card-entry-labels li,
.card-tag-labels li {
margin: 10px 10px 10px auto;
text-align: right;
}
- .preview {
+ .card-preview {
max-width: 100px;
- height: auto;
+ max-height: 50px;
margin-right: 10px;
flex: 1;
-
- img {
- max-width: 100%;
- max-height: 100%;
- }
}
div.metadata {
wallabag_core:
- version: 2.3.4
+ version: 2.3.5-dev
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'
rm -rf $TMP_FOLDER/$RELEASE_FOLDER
mkdir $TMP_FOLDER/$RELEASE_FOLDER
-git clone git@github.com:wallabag/wallabag.git -b $VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION
+git clone git@github.com:wallabag/wallabag.git -b release-$VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION
cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && SYMFONY_ENV=$ENV COMPOSER_MEMORY_LIMIT=-1 composer up -n --no-dev
-cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV
+cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV -n
cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative
cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION
echo "MD5 checksum of the package for wallabag $VERSION"
-md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz
+md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz
echo "Package to upload to the release server:"
-echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz
+echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz
</div>
</aside>
</div>
- {% if entry.previewPicture is not null %}
- <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|e|raw }}" /></div>
- {% endif %}
<article>
{{ entry.content | raw }}
</article>
<div class="card-stacked">
- <div class="preview">
- {% if entry.previewPicture is not null %}
- <a href="{{ path('view', { 'id': entry.id }) }}">
- <img src="{{ entry.previewPicture }}" />
- </a>
- {% endif %}
+ <div class="card-preview">
+ <a href="{{ path('view', { 'id': entry.id }) }}">
+ {% set previewClassModifier = entry.previewPicture ? '' : ' preview--default' %}
+ <span class="preview{{ previewClassModifier }}" style="background-image: url({{ entry.previewPicture | default(asset('wallassets/themes/_global/img/logo-square.svg')) }})"></span>
+ </a>
</div>
{% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withTags': true, 'subClass': 'metadata'} only %}
<ul class="tools-list hide-on-small-only">
{{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
</div>
- {% if entry.previewPicture is not null %}
- <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|default('entry.default_title'|trans)|raw }}" /></div>
- {% endif %}
-
</aside>
<article>
{{ entry.content | raw }}
<main class="valign-wrapper">
<div class="valign row">
<div class="card sw">
- <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" alt="wallabag logo" class="typo-logo" /></div>
+ <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" class="typo-logo" alt="wallabag logo" /></div>
{% block fos_user_content %}
{% endblock fos_user_content %}
</div>