From 7ab7ffed28778b50a57b77a32d05b655eb5f6219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 3 Apr 2023 13:57:37 +0200 Subject: [PATCH] Testing (#36) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update README.md * Use SVG badge * Smaal fixes * Cleaning up * [autopatch] Missing ynh_abort_if_errors in change_url scripts (#6) Co-authored-by: Yunohost-Bot <> * Update manifest.json * Update manifest.json * Fix * [autopatch] Update issue and PR templates (#8) Co-authored-by: Yunohost-Bot <> * Add templates * Update check_process * Add templates * Add screenshots * Post max size * Auto-update README * Update manifest.json * Auto-update README * Create updater.yml * Fix * Cleaning up * Fix * Update manifest.json * Update manifest.json * Auto-update README * Update manifest.json * Auto-update README * Upgrade to version 4.0.0-beta2 (#16) * Upgrade to v4.0.0-beta2 * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: Yunohost-Bot <> * 4.3 (#15) * Upgrade to v4.0.0-beta3 * Auto-update README * rc3 * Auto-update README * php8 * Update check_process * Fix demo link * Auto-update README * reorder * Auto-update README * Upgrade to bullseye * Auto-update README * Update upgrade * Upgrade (#30) * Testing (#17) * Update README.md * Use SVG badge * Smaal fixes * Cleaning up * [autopatch] Missing ynh_abort_if_errors in change_url scripts (#6) Co-authored-by: Yunohost-Bot <> * Update manifest.json * Update manifest.json * Fix * [autopatch] Update issue and PR templates (#8) Co-authored-by: Yunohost-Bot <> * Add templates * Update check_process * Add templates * Add screenshots * Post max size * Auto-update README * Update manifest.json * Auto-update README * Create updater.yml * Fix * Cleaning up * Fix * Update manifest.json * Update manifest.json * Auto-update README * Update manifest.json * Auto-update README * Upgrade to version 4.0.0-beta2 (#16) * Upgrade to v4.0.0-beta2 * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: Yunohost-Bot <> * 4.3 (#15) * Upgrade to v4.0.0-beta3 * Auto-update README * rc3 * Auto-update README * php8 * Update check_process * Fix demo link * Auto-update README * reorder * Auto-update README * Upgrade to bullseye * Auto-update README Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: tituspijean Co-authored-by: yunohost-bot * Revert "Testing (#17)" (#25) This reverts commit 64a84a3dc702cfeb57bd93783b5829b0c2551e46. * 3.14.1 (#28) * 3.14.1 * Auto-update README * Update upgrade Co-authored-by: yunohost-bot * Apply example_ynh * Auto-update README Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: YunoHost Bot Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: tituspijean Co-authored-by: yunohost-bot * Auto-update README * Update manifest.json Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> * Auto-update README * Upgrade auto-updater (#33) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean * Version 2 (#34) * v2 * v2 * Delete DISCLAIMER.md * Fix * Update extra_php-fpm.conf * fix * Fix * Auto-update README --------- Co-authored-by: yunohost-bot * Update manifest.toml * src * Auto-update README * Update upgrade * cleaning --------- Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: tituspijean Co-authored-by: yunohost-bot Co-authored-by: yalh76 Co-authored-by: tituspijean --- .github/workflows/updater.sh | 107 ---------------------------------- .github/workflows/updater.yml | 49 ---------------- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 7 --- manifest.toml | 12 +++- scripts/install | 9 +-- scripts/remove | 11 ++-- scripts/restore | 15 +++-- scripts/upgrade | 11 +--- 10 files changed, 27 insertions(+), 198 deletions(-) delete mode 100644 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml delete mode 100644 conf/app.src diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100644 index c763ffc..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( .tag_name | contains("rc") or contains("beta") or contains("alpha") | not ) | .tag_name' | sort -V | tail -1) -assets="https://github.com/bludit/bludit/archive/$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= -SOURCE_EXTRACT=true -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 -#================================================= - -# Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$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 a56d7cb..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 - 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/README.md b/README.md index a015ca4..21509ad 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Bludit is a Flat-File CMS. Bludit supports Markdown and HTML code for the content. -**Shipped version:** 3.14.1~ynh3 +**Shipped version:** 3.14.1~ynh4 **Demo:** https://demo.bludit.com diff --git a/README_fr.md b/README_fr.md index 6a6a468..c187bb1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Bludit is a Flat-File CMS. Bludit supports Markdown and HTML code for the content. -**Version incluse :** 3.14.1~ynh3 +**Version incluse :** 3.14.1~ynh4 **Démo :** https://demo.bludit.com diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index a2441b7..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/bludit/bludit/archive/3.14.1.tar.gz -SOURCE_SUM=27f96c1cd478c0885d402ccd5192ee5c227e5293ea23f53f92d652b9e46bf7af -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/manifest.toml b/manifest.toml index c5f57cc..d9e2327 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Bludit" description.en = "Simple, Fast, Secure, Flat-File CMS" description.fr = "CMS simple, rapide, sécurisé et à fichier plat" -version = "3.14.1~ynh3" +version = "3.14.1~ynh4" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://docs.bludit.com/en/" code = "https://github.com/bludit/bludit" [integration] -yunohost = ">= 11.1.13" +yunohost = ">= 11.1.16" architectures = "all" multi_instance = true ldap = false @@ -41,6 +41,14 @@ ram.runtime = "50M" default = "visitors" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://github.com/bludit/bludit/archive/3.14.1.tar.gz" + sha256 = "27f96c1cd478c0885d402ccd5192ee5c227e5293ea23f53f92d652b9e46bf7af" + autoupdate.strategy = "latest_github_tag" + [resources.system_user] [resources.install_dir] diff --git a/scripts/install b/scripts/install index 899d4d9..57ccb81 100644 --- a/scripts/install +++ b/scripts/install @@ -21,18 +21,13 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# PHP-FPM CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index e149006..e69e0af 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,18 +10,15 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +# REMOVE SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=3 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 9e3149c..581b603 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,24 +20,23 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE SYSTEM CONFIGURATIONS #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= -# RELOAD NGINX AND PHP-FPM +# GENERIC FINALIZATION #================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2 +# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE +#================================================= +ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 7e75306..907c12e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,11 +9,9 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." --weight=1 upgrade_type=$(ynh_check_app_version_changed) @@ -33,18 +31,13 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# PHP-FPM CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - # Create a dedicated NGINX config ynh_add_nginx_config