From 2a4502f346e27abcf7a1fd36efeea60190ae3113 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 17 Sep 2021 08:42:57 +0200 Subject: [PATCH 1/6] Remove bot --- .github/workflows/updater.sh | 134 ---------------------------------- .github/workflows/updater.yml | 48 ------------ 2 files changed, 182 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 4d51a3a..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,134 +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.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=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) - -# 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 - *".deb"*) - src="api" - ;; - *".zip"*) - src="front" - ;; -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_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=vikunja-unstable-amd64.deb -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 -#================================================= - -# Install moreutils, needed for sponge -sudo apt-get install moreutils - -# 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 ca77fed..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,48 +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@v2 - 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@v3 - 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 }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false From d7d62b539f066893fdd2d159a0f0b0a20d3ef955 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 08:38:42 +0200 Subject: [PATCH 2/6] Fix --- manifest.json | 3 +-- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 2a70716..59f17fb 100644 --- a/manifest.json +++ b/manifest.json @@ -30,8 +30,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "is_public", diff --git a/scripts/_common.sh b/scripts/_common.sh index c931b15..2bd68b5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="postgresql apt-transport-https redis-server" +pkg_dependencies="postgresql apt-transport-https" #================================================= # PERSONAL HELPERS From eb4990acfc03af4515b6797b5ae7aa6c97b2db11 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 08:40:29 +0200 Subject: [PATCH 3/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 59f17fb..196e6f8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted To-Do list application", "fr": "Application de liste de tâches auto-hébergée" }, - "version": "0.18.1~ynh1", + "version": "0.18.1~ynh2", "url": "https://vikunja.io/", "upstream": { "license": "GPL-3.0", From b0c5da5358bf590ae0992c560205445bada36f9a Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 19 Sep 2021 06:40:33 +0000 Subject: [PATCH 4/6] 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 d13625c..48e19c2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Self-hosted To-Do list application -**Shipped version:** 0.18.1~ynh1 +**Shipped version:** 0.18.1~ynh2 **Demo:** https://try.vikunja.io/login diff --git a/README_fr.md b/README_fr.md index 18a9e74..feb2ecd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Vikunja est une application de liste de tâches Open Source auto-hébergée pour toutes les plateformes. -**Version incluse :** 0.18.1~ynh1 +**Version incluse :** 0.18.1~ynh2 **Démo :** https://try.vikunja.io/login From 77f3df767b3b5e4dadfe0476b6ca920149e76c27 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 20 Sep 2021 22:16:57 +0200 Subject: [PATCH 5/6] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 609771e..1c09288 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,7 +87,7 @@ then tempdir="$(mktemp -d)" ynh_setup_source --dest_dir=$tempdir --source_id=api - ynh_exec_warn_less dpkg -i $tempdir/vikunja-unstable-amd64.deb + ynh_exec_warn_less N | dpkg -i $tempdir/vikunja-unstable-amd64.deb ynh_script_progression --message="Upgrading source files..." --weight=5 From fef0d6db09eac3ba998991c8e577aba3e64d7e43 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 20 Sep 2021 22:41:28 +0200 Subject: [PATCH 6/6] Update check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 88c0bfb..518c46a 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit= + upgrade=1 from_commit=b7c5209ca080054e8777c1882f4bf54851834270 backup_restore=1 multi_instance=1 change_url=1 @@ -21,6 +21,6 @@ Email= Notification=none ;;; Upgrade options - ; commit= - name= + ; commit=b7c5209ca080054e8777c1882f4bf54851834270 + name=Merge pull request #11 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=4533& \ No newline at end of file