From 19400a1a4f221f4e67044bf8bff7f2fa8c039c09 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Aug 2023 22:27:53 +0200 Subject: [PATCH 1/3] fix linter --- .github/workflows/updater.sh | 107 ---------------------------------- .github/workflows/updater.yml | 50 ---------------- manifest.toml | 10 +++- 3 files changed, 7 insertions(+), 160 deletions(-) delete mode 100644 .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 100644 index 643b834..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,107 +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. - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -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="https://github.com/RSS-Bridge/rss-bridge/archive/refs/tags/$version.tar.gz" - -# 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 -echo "REPO=$repo" >> $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 - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Let's download source tarball -asset_url=$assets - -echo "Handling asset at $asset_url" - -src="app" - -# 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_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -EOT -echo "... conf/$src.src updated" - -#================================================= -# 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 -#================================================= - -clean_version=${version//-/.} -# Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$clean_version~ynh1\"" manifest.json)" > manifest.json - -# 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 08ec1b3..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,50 +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 - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false - diff --git a/manifest.toml b/manifest.toml index f885e0b..e3c1a08 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ admindoc = "https://github.com/RSS-Bridge/rss-bridge/wiki" code = "https://github.com/RSS-Bridge/rss-bridge" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -33,6 +33,10 @@ ram.runtime = "50M" type = "path" default = "/rss-bridge" + [install.init_main_permission] + type = "group" + default = "visitors" + [resources] [resources.sources.main] url = "https://github.com/RSS-Bridge/rss-bridge/archive/refs/tags/2023-07-13.tar.gz" @@ -46,5 +50,5 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.1-fpm, php8.1-mbstring, php8.1-xml, php8.1-curl" - + packages = "php8.2-fpm, php8.2-mbstring, php8.2-xml, php8.2-curl" + \ No newline at end of file From d811c23cf31322dabbbca84777841a7bf67fa819 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Aug 2023 22:59:33 +0200 Subject: [PATCH 2/3] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e3c1a08..101262b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "RSS-Bridge" description.en = "RSS and Atom feed generator for websites that don't have one" description.fr = "Générateur de flux RSS et Atom pour les sites Web qui n'en ont pas" -version = "2023.07.13~ynh1" +version = "2023.07.13~ynh2" maintainers = ["JimboJoe"] From b11e42affd245b10a0f00e903d5b6f1d11098667 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 25 Aug 2023 20:59:38 +0000 Subject: [PATCH 3/3] 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 a3d3ea8..af15e4d 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Output format can take several forms: * `Plaintext` : raw text (php object, as returned by print_r) -**Shipped version:** 2023.07.13~ynh1 +**Shipped version:** 2023.07.13~ynh2 **Demo:** https://wtf.roflcopter.fr/rss-bridge/ diff --git a/README_fr.md b/README_fr.md index 9c82886..ea98f03 100644 --- a/README_fr.md +++ b/README_fr.md @@ -53,7 +53,7 @@ Output format can take several forms: * `Plaintext` : raw text (php object, as returned by print_r) -**Version incluse :** 2023.07.13~ynh1 +**Version incluse :** 2023.07.13~ynh2 **Démo :** https://wtf.roflcopter.fr/rss-bridge/