From 26f2bc09fbbc9f6b648758fb306a5ab2f0a05cd4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 May 2023 08:01:05 +0200 Subject: [PATCH 1/8] Update manifest.toml --- manifest.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0f65ad7..5ba31db 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://libreddit.spike.codes/" code = "https://github.com/spikecodes/libreddit" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.18" architectures = ["amd64"] multi_instance = true ldap = false @@ -43,6 +43,7 @@ ram.runtime = "50M" extract = false in_subdir = false rename = "libreddit" + autoupdate.strategy = "latest_github_tag" [resources.system_user] From 39aa77a76f47ef92294e35d204a09f019391875f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:46:02 +0200 Subject: [PATCH 2/8] add fr --- doc/DESCRIPTION_fr.md | 8 ++++++++ manifest.toml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..e5b3859 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,8 @@ +Libreddit est un mot-valise de "libre" (qui signifie liberté) et "Reddit". C'est une interface privée comme Invidious mais pour Reddit. Parcourez les prises les plus froides de r/unpopularopinion sans être suivi. + +### Caractéristiques + +- Écrit en Rust pour des vitesses ultra rapides et la sécurité de la mémoire +- Pas de JavaScript, pas de publicité, pas de suivi, pas de ballonnement +- Toutes les requêtes sont transmises via le serveur, y compris les médias +- Une politique de sécurité du contenu solide empêche les requêtes du navigateur à Reddit \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 5ba31db..fbac2f5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://libreddit.spike.codes/" code = "https://github.com/spikecodes/libreddit" [integration] -yunohost = ">= 11.1.18" +yunohost = ">= 11.1.19" architectures = ["amd64"] multi_instance = true ldap = false From 88250d0cf2e6f6eb5bf01c969dede55d81cd784d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 1 Jun 2023 08:46:07 +0000 Subject: [PATCH 3/8] Auto-update README --- README_fr.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README_fr.md b/README_fr.md index 8fe82d6..b00261f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,15 +16,14 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Libreddit is a portmanteau of "libre" (meaning freedom) and "Reddit". It is a private front-end like Invidious but for Reddit. Browse the coldest takes of r/unpopularopinion without being tracked. +Libreddit est un mot-valise de "libre" (qui signifie liberté) et "Reddit". C'est une interface privée comme Invidious mais pour Reddit. Parcourez les prises les plus froides de r/unpopularopinion sans être suivi. -### Features - -- Written in Rust for blazing fast speeds and memory safety -- No JavaScript, no ads, no tracking, no bloat -- All requests are proxied through the server, including media -- Strong Content Security Policy prevents browser requests to Reddit +### Caractéristiques +- Écrit en Rust pour des vitesses ultra rapides et la sécurité de la mémoire +- Pas de JavaScript, pas de publicité, pas de suivi, pas de ballonnement +- Toutes les requêtes sont transmises via le serveur, y compris les médias +- Une politique de sécurité du contenu solide empêche les requêtes du navigateur à Reddit **Version incluse :** 0.30.1~ynh2 From 26d25dfa502518b67c2916d3097cef9eb6814f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:46:26 +0200 Subject: [PATCH 4/8] fix --- .github/workflows/updater.sh | 133 ---------------------------------- .github/workflows/updater.yml | 49 ------------- 2 files changed, 182 deletions(-) delete mode 100755 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100755 index 96176ae..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -# Remove this exit command when you are ready to run this Action -#exit 1 - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]') -repo=$(cat manifest.toml | tomlq -j '.upstream.code|split("https://github.com/")[1]') -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) -assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) -echo "${#assets[@]} available asset(s)" - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Here we use the $assets variable to get the resources published in the upstream release. -# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. - -# Let's loop over the array of assets URLs -for asset_url in ${assets[@]}; do - -echo "Handling asset at $asset_url" - -# Assign the asset to a source file in conf/ directory -# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) -# Leave $src empty to ignore the asset -case $asset_url in - *"/libreddit") - src="app" - ;; - *) - src="" - ;; -esac - -# If $src is not empty, let's process the asset -if [ ! -z "$src" ]; then - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=libreddit -SOURCE_EXTRACT=false -EOT -echo "... conf/$src.src updated" - -else -echo "... asset ignored" -fi - -done - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -sed -i "s/^version\s*=.*/version = \"$version~ynh1\"/" manifest.toml - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index 2df69db..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,49 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash ./.github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - branch: ci-auto-update-v${{ env.VERSION }} - base: testing - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false From 5b12c96bff2689fba2dbae97f0c0d8623dc33236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 08:22:47 +0200 Subject: [PATCH 5/8] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index fbac2f5..da5f24f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Libreddit" description.en = "Libre alternative to Reddit" description.fr = "Alternative libre à Reddit" -version = "0.30.1~ynh2" +version = "0.30.1~ynh3" maintainers = ["eric_G"] @@ -39,7 +39,7 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] url = "https://github.com/spikecodes/libreddit/releases/download/v0.30.1/libreddit" - sha256 = "d9b3cbc278b0427904e1c414441fd8daa355eacec471e33e027dd0694ce68e8b" + sha256 = "9bba0a2bc4fc18d2f27d3793359f700921ebe1812c59623d83e04d2e39cfec28" extract = false in_subdir = false rename = "libreddit" From 40a547f47bac99d177f8ca0194fae33aba366ac6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 7 Jun 2023 06:22:52 +0000 Subject: [PATCH 6/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 73c347f..abe2cfb 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Libreddit is a portmanteau of "libre" (meaning freedom) and "Reddit". It is a pr - Strong Content Security Policy prevents browser requests to Reddit -**Shipped version:** 0.30.1~ynh2 +**Shipped version:** 0.30.1~ynh3 **Demo:** https://libreddit.spike.codes/ diff --git a/README_fr.md b/README_fr.md index b00261f..286bb5b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Libreddit est un mot-valise de "libre" (qui signifie liberté) et "Reddit". C'es - Toutes les requêtes sont transmises via le serveur, y compris les médias - Une politique de sécurité du contenu solide empêche les requêtes du navigateur à Reddit -**Version incluse :** 0.30.1~ynh2 +**Version incluse :** 0.30.1~ynh3 **Démo :** https://libreddit.spike.codes/ From 6530f44a8aa4c2c9017d5885625acb599ce0f235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 8 Jun 2023 10:13:18 +0200 Subject: [PATCH 7/8] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index da5f24f..9649cf3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Libreddit" description.en = "Libre alternative to Reddit" description.fr = "Alternative libre à Reddit" -version = "0.30.1~ynh3" +version = "0.30.1~ynh4" maintainers = ["eric_G"] @@ -38,8 +38,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/spikecodes/libreddit/releases/download/v0.30.1/libreddit" - sha256 = "9bba0a2bc4fc18d2f27d3793359f700921ebe1812c59623d83e04d2e39cfec28" + url = "https://github.com/spikecodes/libreddit/releases/download/v0.30.0/libreddit" + sha256 = "7148815a160acf4b19d5fec1e3c47f9fc7a850a212f3b83ed88a1a76c39882c9" extract = false in_subdir = false rename = "libreddit" From 9b5431d438d785616c86a8dc5715ebc3d335a9b6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Jun 2023 08:13:23 +0000 Subject: [PATCH 8/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index abe2cfb..f0f8784 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Libreddit is a portmanteau of "libre" (meaning freedom) and "Reddit". It is a pr - Strong Content Security Policy prevents browser requests to Reddit -**Shipped version:** 0.30.1~ynh3 +**Shipped version:** 0.30.1~ynh4 **Demo:** https://libreddit.spike.codes/ diff --git a/README_fr.md b/README_fr.md index 286bb5b..dbe42f1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Libreddit est un mot-valise de "libre" (qui signifie liberté) et "Reddit". C'es - Toutes les requêtes sont transmises via le serveur, y compris les médias - Une politique de sécurité du contenu solide empêche les requêtes du navigateur à Reddit -**Version incluse :** 0.30.1~ynh3 +**Version incluse :** 0.30.1~ynh4 **Démo :** https://libreddit.spike.codes/