diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 0ef3295..9da4d0a 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -10,7 +10,8 @@ # automatic actions when a new upstream release is detected. # Remove this exit command when you are ready to run this Action -# exit 1 + +exit 1 #================================================= # FETCHING LATEST RELEASE AND ITS ASSETS @@ -19,6 +20,7 @@ # 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) latest_release_json=$(curl --silent "https://codeberg.org/api/v1/repos/calckey/calckey/releases" | jq -r '[.[] | select( .prerelease != true )][0]') version=$(echo $latest_release_json | jq -r '.tag_name') diff --git a/README.md b/README.md index 36d225c..80bd35c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ A greatly enhanced fork of Misskey with better UI/UX, security, features, and mo -**Shipped version:** 13.1.2~ynh1 +**Shipped version:** 13.1.4.1~ynh1 **Demo:** https://i.calckey.cloud/ diff --git a/README_fr.md b/README_fr.md index 3561cae..fe38311 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ Un fork grandement amélioré de Misskey avec une meilleure UI/UX, sécurité, f Calckey ajoute de nombreux changements de qualité de vie et des corrections de bogues pour les utilisateurs et les administrateurs d'instance. -**Version incluse :** 13.1.2~ynh1 +**Version incluse :** 13.1.4.1~ynh1 **Démo :** https://i.calckey.cloud/ diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 3c40761..0000000 --- a/conf/app.src +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.1.2.tar.gz -SOURCE_SUM=1CA6ACE1BAC1F9BFBA70FC55F828F8C6F3BCC042003A6FE8D9FB16DF0AD678EB -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true diff --git a/manifest.toml b/manifest.toml index d3bc8e1..5abc9e2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Calckey" description.en = "Fork of Misskey with better UI/UX, security, features" description.fr = "Un fork de Misskey avec une meilleure interface utilisateur, la sécurité, les fonctionnalités" -version = "13.1.2~ynh1" +version = "13.1.4.1~ynh1" maintainers = ["oufmilo"] @@ -16,14 +16,14 @@ demo = "https://i.calckey.cloud/" code = "https://codeberg.org/calckey/calckey" [integration] -yunohost = ">= 11.0.0" +yunohost = ">= 11.1.14" architectures = "all" multi_instance = false ldap = "not_relevant" sso = "not_relevant" disk = "50M" -ram.build = "50M" -ram.runtime = "50M" +ram.build = "2G" +ram.runtime = "2G" [install] [install.domain] @@ -38,6 +38,11 @@ ram.runtime = "50M" default = "visitors" [resources] + + [resources.sources.main] + url = "https://codeberg.org/calckey/calckey/archive/v13.1.4.1.tar.gz" + sha256 = "5bd66e8ade6abaf205da6c4ad9a9389719c09ce0bbf672389e1b84af48afcbbc" + [resources.system_user] [resources.install_dir] diff --git a/scripts/_common.sh b/scripts/_common.sh index ffeb039..42e7239 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,9 +8,6 @@ NODEJS_VERSION="19" -# dependencies used by the app -pkg_dependencies="ffmpeg postgresql build-essential" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 6be975a..4973de6 100644 --- a/scripts/install +++ b/scripts/install @@ -70,9 +70,9 @@ pushd "$install_dir" ynh_use_nodejs corepack enable corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run init + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init popd #=================================================