diff --git a/manifest.toml b/manifest.toml index 5abc9e2..05e4b87 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.4.1~ynh1" +version = "14.0.0rc~ynh1" maintainers = ["oufmilo"] @@ -40,8 +40,8 @@ ram.runtime = "2G" [resources] [resources.sources.main] - url = "https://codeberg.org/calckey/calckey/archive/v13.1.4.1.tar.gz" - sha256 = "5bd66e8ade6abaf205da6c4ad9a9389719c09ce0bbf672389e1b84af48afcbbc" + url = "https://codeberg.org/calckey/calckey/archive/v14.0.0-rc.tar.gz" + sha256 = "3dc6023c4c816ab3504a8f2c7d2c2b2c908cb58c0cda0821631a314a29d3b0f6" [resources.system_user] @@ -54,7 +54,7 @@ ram.runtime = "2G" main.default = 3020 [resources.apt] - packages = "ffmpeg, postgresql, build-essential" + packages = "ffmpeg, postgresql, build-essential, curl" [resources.database] - type = "postgresql" \ No newline at end of file + type = "postgresql" diff --git a/scripts/install b/scripts/install index 4973de6..b2f5681 100644 --- a/scripts/install +++ b/scripts/install @@ -67,6 +67,8 @@ chown $app:$app "$install_dir/.config/default.yml" ynh_script_progression --message="Building app... This will take some time." --weight=15 pushd "$install_dir" + curl https://sh.rustup.rs -sSf | ynh_exec_warn_less ynh_exec_as $app sh -s -- -y + export PATH="$install_dir/.cargo/bin:$PATH" ynh_use_nodejs corepack enable corepack prepare pnpm@latest --activate diff --git a/scripts/restore b/scripts/restore index 0fea344..27a899f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -34,10 +34,12 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= # REINSTALL PNPM #================================================= -ynh_script_progression --message="Reinstalling pnpm..." --weight=1 +ynh_script_progression --message="Reinstalling pnpm + rust..." --weight=1 -# Define and install pnpm +# Define and install pnpm + rust pushd "$install_dir" + curl https://sh.rustup.rs -sSf | ynh_exec_warn_less ynh_exec_as $app sh -s -- -y + export PATH="$install_dir/.cargo/bin:$PATH" ynh_use_nodejs corepack enable corepack prepare pnpm@latest --activate diff --git a/scripts/upgrade b/scripts/upgrade index aca8f7e..682f2a4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ upgrade_type=$(ynh_check_app_version_changed) # ENSURE DOWNWARD COMPATIBILITY #================================================= -if ynh_compare_current_package_version --comparison lt --version 12.105.0~ynh1 +if ynh_compare_current_package_version --comparison lt --version 13.0.5~ynh1 then ynh_die --message="Sorry, this version is not upgradable to the latest version :(" fi @@ -96,15 +96,18 @@ ynh_add_nginx_config #================================================= # BUILD APP #================================================= -ynh_script_progression --message="Building app..." +ynh_script_progression --message="Installing rust and building app…" pushd "$install_dir" - corepack enable - corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all - 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 run build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate + curl https://sh.rustup.rs -sSf | ynh_exec_warn_less ynh_exec_as $app sh -s -- -y + export PATH="$install_dir/.cargo/bin:$PATH" + ynh_use_nodejs + corepack enable + corepack prepare pnpm@latest --activate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all + 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 run build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate popd #================================================= diff --git a/tests.toml b/tests.toml index 71e7a74..4299b9c 100644 --- a/tests.toml +++ b/tests.toml @@ -14,4 +14,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.89f4f52.name = "Upgrade from 13.0.5" + test_upgrade_from.89f4f52.name = "13.1.4.1"