From a55fb74bd2a77ccbcb1a260d74da319a377fe8bd Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 3 Apr 2022 15:02:27 +0000 Subject: [PATCH 1/4] enh: updater script --- .github/workflows/updater.sh | 104 ++++++++++++++++++++++++++++++++++ .github/workflows/updater.yml | 49 ++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 .github/workflows/updater.sh create mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100644 index 0000000..2c57665 --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,104 @@ +#!/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/$repo/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 +# 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 +#================================================= + +# 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 new file mode 100644 index 0000000..fb72ba0 --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,49 @@ +# 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 + 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 From 1fd4fed885acfa8df66212173bd776888de9ed8c Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 3 Apr 2022 15:02:46 +0000 Subject: [PATCH 2/4] Update to 1.13.1 --- conf/app.src | 7 +++---- manifest.json | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/conf/app.src b/conf/app.src index 35ddc0e..0099746 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://github.com/louislam/uptime-kuma/archive/refs/tags/1.11.3.tar.gz -SOURCE_SUM=ae2605835d16d6ce5801ef5392d94c21aa5c2a9d129aa508c82b88a1e6d5327d +SOURCE_URL=https://github.com/louislam/uptime-kuma/archive/refs/tags/1.13.1.tar.gz +SOURCE_SUM=c549a3873ada86b810a8167165a0348ae8b725d8f20c1409e73e1690f0afaa34 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=uptime-kuma-1.11.3.tar.gz -SOURCE_EXTRACT=true +SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index 69efce4..5720bec 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted monitoring tool like Uptime-Robot", "fr": "Outil de surveillance auto-hébergé similaire à Uptime-Robot" }, - "version": "1.11.3~ynh2", + "version": "1.13.1~ynh1", "url": "https://github.com/louislam/uptime-kuma/", "upstream": { "license": "MIT", @@ -14,7 +14,7 @@ "demo": "https://demo.uptime.kuma.pet", "admindoc": "https://github.com/louislam/uptime-kuma/wiki", "userdoc": "https://github.com/louislam/uptime-kuma/wiki", - "code": "https://github.com/louislam/uptime-kuma/" + "code": "https://github.com/louislam/uptime-kuma" }, "license": "AGPL-3.0-or-later", "maintainer": { From 6d8076f14a67fae2ed7b132da58b781c1ac9ca30 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sat, 2 Apr 2022 18:08:43 +0200 Subject: [PATCH 3/4] fix: Allow Ping Monitor to work --- conf/systemd.service | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index ee080d4..a246538 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -16,20 +16,20 @@ StandardError=inherit # Depending on specificities of your service/app, you may need to tweak these # .. but this should be a good baseline # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html -NoNewPrivileges=yes +NoNewPrivileges=no PrivateTmp=yes -PrivateDevices=yes +#PrivateDevices=yes # May conflict with SMTP: https://github.com/YunoHost-Apps/uptime-kuma_ynh/issues/6 # RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 -RestrictNamespaces=yes -RestrictRealtime=yes +#RestrictNamespaces=yes +#RestrictRealtime=yes DevicePolicy=closed ProtectSystem=full ProtectControlGroups=yes -ProtectKernelModules=yes -ProtectKernelTunables=yes -LockPersonality=yes -SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap +#ProtectKernelModules=yes +#ProtectKernelTunables=yes +#LockPersonality=yes +#SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap # Denying access to capabilities that should not be relevant for webapps # Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html @@ -40,7 +40,7 @@ CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE -CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW +#CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG [Install] From 315ce551d704cd3d0a81b1a810d97fa9ee19fa3a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 4 Apr 2022 00:00:39 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 52d5559..7b11b76 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ It is a self-hosted monitoring tool like "Uptime Robot". - Certificate Info -**Shipped version:** 1.11.3~ynh2 +**Shipped version:** 1.13.1~ynh1 **Demo:** https://demo.uptime.kuma.pet @@ -51,7 +51,7 @@ It is a self-hosted monitoring tool like "Uptime Robot". * Official app website: https://uptime.kuma.pet/ * Official user documentation: https://github.com/louislam/uptime-kuma/wiki * Official admin documentation: https://github.com/louislam/uptime-kuma/wiki -* Upstream app code repository: https://github.com/louislam/uptime-kuma/ +* Upstream app code repository: https://github.com/louislam/uptime-kuma * YunoHost documentation for this app: https://yunohost.org/app_uptime-kuma * Report a bug: https://github.com/YunoHost-Apps/uptime-kuma_ynh/issues diff --git a/README_fr.md b/README_fr.md index f4f3f9c..419b443 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ It is a self-hosted monitoring tool like "Uptime Robot". - Certificate Info -**Version incluse :** 1.11.3~ynh2 +**Version incluse :** 1.13.1~ynh1 **Démo :** https://demo.uptime.kuma.pet @@ -47,7 +47,7 @@ It is a self-hosted monitoring tool like "Uptime Robot". * Site officiel de l'app : https://uptime.kuma.pet/ * Documentation officielle utilisateur : https://github.com/louislam/uptime-kuma/wiki * Documentation officielle de l'admin : https://github.com/louislam/uptime-kuma/wiki -* Dépôt de code officiel de l'app : https://github.com/louislam/uptime-kuma/ +* Dépôt de code officiel de l'app : https://github.com/louislam/uptime-kuma * Documentation YunoHost pour cette app : https://yunohost.org/app_uptime-kuma * Signaler un bug : https://github.com/YunoHost-Apps/uptime-kuma_ynh/issues