Testing (#112)

* 22.06

* Auto-update README

* Update manifest.json

* Fix

* 22.06.1

* Auto-update README

* Update upgrade

* 22.06.2

* Auto-update README

* Update app.src

* Update DESCRIPTION.md

* Auto-update README

* Update nginx.conf

* Update .env.example.complete

* Update .env.example.complete

* Update install

* Revert "Update install"

This reverts commit e43db7a0de.

* 22.07.1 (#80)

* 22.07.1

* Auto-update README

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* Auto-update README

* Auto-update README

* 22.07.2 (#82)

* 22.07.2

* Auto-update README

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* 22.07.3 (#84)

* 22.07.3

* Auto-update README

* Update manifest.json

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* Update upgrade

* 22.09 (#88)

* 22.09

* Auto-update README

* Update app.src

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* 22.09.1

* Auto-update README

* upgrade composer

* upgrade config (#91)

* Update manifest.json

* Auto-update README

* Update upgrade

* 22.10

* Auto-update README

* 22.10.1

* 22.11

* Auto-update README

* 22.11.1

* Auto-update README

* Upgrade to version 22.11.1 (#100)

* Upgrade to v22.11.1

* Auto-update README

Co-authored-by: yunohost-bot <yunohost-bot@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>

* Fis php (#102)

* Update upgrade

* reorder script

* Update manifest.json

* Auto-update README

* Update restore

* Fix size

* Auto-update README

* Update DESCRIPTION_fr.md

* Auto-update README

* Fix

* 23.01

* Auto-update README

* PHP8.1

* 23.01.1

* Auto-update README

* Upgrade auto-updater (#108)

* [autopatch] Upgrade auto-updater

* Auto-update README

---------

Co-authored-by: tituspijean <titus@pijean.ovh>

* V2 (#107)

* Auto-update README

* v2

* Fix

* Update manifest.toml

* Update manifest.toml

* Fix

* Create post_install.md

* Fix

* Auto-update README

* Update install

* Update config_panel.toml

* Update manifest.toml

* Update _common.sh

* Update tests.toml

* Add post

* Update manifest.toml

* Update remove

* Update install

* Update _common.sh

* Fix

* Update change_url

* Update upgrade

* Auto-update README

* cleaning

* remove PHP version

* Update _common.sh

* Update manifest.toml

* Fix

* fix

* Update manifest.toml

* Update manifest.toml

* Update upgrade

* Update manifest.toml

* 23.02

* Auto-update README

* Update change_url

* Update change_url

* Update upgrade

---------

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* Fix

* Auto-update README

* Update manifest.toml

* fix

* Update manifest.toml

* Update manifest.toml

* Auto-update README

* new autoupdate

* cleaning

* Update manifest.toml

* Update manifest.toml

* Auto-update README

* cleaning

---------

Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost-bot@users.noreply.github.com>
Co-authored-by: tituspijean <titus@pijean.ovh>

.github/workflows/updater.sh

@@ -1,109 +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 "'"))
-asset_url=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select(.tag_name=="'$version'").tarball_url')
-
-# 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"
-
-src="app"
-
-# Create the temporary directory
-tempdir="$(mktemp -d)"
-
-# Download sources and calculate checksum
-filename="temp.tar.gz"
-curl --silent -4 -L $asset_url -o "$tempdir/$filename"
-checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
-
-# Delete temporary directory
-rm -rf $tempdir
-
-# Rewrite source file
-cat <<EOT > conf/$src.src
-SOURCE_URL=$asset_url
-SOURCE_SUM=$checksum
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
-SOURCE_EXTRACT=true
-SOURCE_FILENAME=bookstack.tar.gz
-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 "$(tomlq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > 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

.github/workflows/updater.yml

@@ -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 <yunohost-bot@users.noreply.github.com>'
-          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          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 }}
-            [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }})
-          draft: false

README.md

@@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
 - Diagrams.net Integration
 
 
-**Shipped version:** 23.02.2~ynh1
+**Shipped version:** 23.02.3~ynh1
 
 **Demo:** https://demo.bookstackapp.com
 

README_fr.md

@@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate
 - Multilingue
 
 
-**Version incluse :** 23.02.2~ynh1
+**Version incluse :** 23.02.3~ynh1
 
 **Démo :** https://demo.bookstackapp.com
 

manifest.toml

@@ -5,7 +5,7 @@ name = "BookStack"
 description.en = "Platform to create documentation/wiki content"
 description.fr = "Plateforme pour créer du contenu de documentation/wiki"
 
-version = "23.02.2~ynh1"
+version = "23.02.3~ynh1"
 
 maintainers = ["eric_G"]
 
@@ -18,11 +18,11 @@ userdoc = "https://www.bookstackapp.com/docs/user/"
 code = "https://github.com/BookStackApp/BookStack"
 
 [integration]
-yunohost = ">= 11.1.15"
+yunohost = ">= 11.1.17"
 architectures = "all"
 multi_instance = true
 ldap = true
-sso = false
+sso = true
 disk = "50M"
 ram.build = "500M"
 ram.runtime = "50M"
@@ -56,9 +56,10 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://api.github.com/repos/BookStackApp/BookStack/tarball/v23.02.2"
+        url = "https://api.github.com/repos/BookStackApp/BookStack/tarball/v23.02.3"
-        sha256 = "e06d582d897c1295e79a316754d4bd66f8308a79f97542ee39a018efb104c389"
+        sha256 = "f2fc2a27dc27a2f798a139a414ff6397af91b812146533022ceff3dde98eb133"
         rename = "bookstack.tar.gz"
+        autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
 

scripts/_common.sh

@@ -4,8 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="8.1"
-
 YNH_COMPOSER_VERSION=2.4.2
 
 #=================================================

scripts/install

@@ -9,6 +9,10 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# RETRIEVE ARGUMENTS FROM THE MANIFEST
+#=================================================
+
 timezone="$(cat /etc/timezone)"
 redis_db=$(ynh_redis_get_free_db)
 email=$(ynh_user_get_info --username=$admin --key=mail)
@@ -21,7 +25,6 @@ fpm_usage="low"
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db
 ynh_app_setting_set --app=$app --key=auth_method --value=$auth_method
@@ -37,7 +40,6 @@ ynh_script_progression --message="Setting up source files..." --weight=7
 ynh_setup_source --dest_dir="$install_dir"
 
 # Set permissions to app files
-chmod 750 $install_dir
 chmod -R o-rwx $install_dir
 chown -R $app:www-data $install_dir
 

scripts/restore

@@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 ynh_restore_file --origin_path="$install_dir"
 
 # Restore permissions on app files
-chmod 750 $install_dir
 chmod -R o-rwx $install_dir
 chown -R $app:www-data $install_dir
 chmod 600 $install_dir/.env

scripts/upgrade

@@ -56,7 +56,6 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep=".env public/uploads storage/uploads"
 fi
 
-chmod 755 $install_dir
 chmod -R o-rwx $install_dir
 chown -R $app:www-data $install_dir
 

tests.toml

@@ -2,6 +2,14 @@ test_format = 1.0
 
 [default]
 
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+    
     exclude = ["install.nourl"]
 
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
+
     test_upgrade_from.d653976.name = "Upgrade from 23.01"