From 15db07f2cadcbfe7aceff3a4edcb597203d85fb0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 26 Jul 2022 00:02:18 +0200 Subject: [PATCH] Upgrade to 0.13.0~ynh1 --- README.md | 8 ++++---- README_fr.md | 8 ++++---- conf/app.src | 4 ++-- doc/DISCLAIMER.md | 6 +++--- doc/DISCLAIMER_fr.md | 6 +++--- manifest.json | 2 +- scripts/_common.sh | 8 +++++++- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 7b0c1f5..a80aa10 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Multiplayer voxel RPG inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft -**Shipped version:** 0.12.0~ynh1 +**Shipped version:** 0.13.0~ynh1 **Demo:** server.veloren.net:14004 @@ -31,9 +31,9 @@ Multiplayer voxel RPG inspired by games such as Cube World, Legend of Zelda: Bre Veloren is in pre-alpha, il y aura des bugs. This package provides the last "release" version of Veloren, which is older than that of the official server. You will need to download the corresponding version of the client: - * [Windows x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=windows) - * [Linux x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=linux) - * [MacOS x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=macos) + * [Windows x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=windows) + * [Linux x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=linux) + * [MacOS x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=macos) ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index d8bd963..a6e787b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour RPG voxel multijoueur inspiré de jeux tels que Cube World, Legend of Zelda : Breath of the Wild, Dwarf Fortress et Minecraft -**Version incluse :** 0.12.0~ynh1 +**Version incluse :** 0.13.0~ynh1 **Démo :** server.veloren.net:14004 @@ -31,9 +31,9 @@ RPG voxel multijoueur inspiré de jeux tels que Cube World, Legend of Zelda : Br Veloren est en pre-alpha, il y aura des bugs. Ce paquet fournit la dernière version "release" de Veloren, qui est plus ancienne que celle du serveur officiel. Il vous faudra télécharger la version correspondante du client: - * [Windows x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=windows) - * [Linux x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=linux) - * [MacOS x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=macos) + * [Windows x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=windows) + * [Linux x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=linux) + * [MacOS x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=macos) ## Documentations et ressources diff --git a/conf/app.src b/conf/app.src index 2e6ec5e..e8a969a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://gitlab.com/veloren/veloren/-/archive/v0.12.0/veloren-v0.12.0.tar.gz +SOURCE_URL=https://gitlab.com/veloren/veloren/-/archive/v0.13.0/veloren-v0.13.0.tar.gz SOURCE_SUM=10fc0d1cb123ff9caf4ff90412df5241306780dbd2a43be1e37a0c8bac437697 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=veloren-v0.12.0.tar.gz +SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 4f626cd..ef7d9c4 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,6 +1,6 @@ Veloren is in pre-alpha, il y aura des bugs. This package provides the last "release" version of Veloren, which is older than that of the official server. You will need to download the corresponding version of the client: - * [Windows x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=windows) - * [Linux x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=linux) - * [MacOS x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=macos) + * [Windows x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=windows) + * [Linux x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=linux) + * [MacOS x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=macos) diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 0e3ccd3..a90871a 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,6 +1,6 @@ Veloren est en pre-alpha, il y aura des bugs. Ce paquet fournit la dernière version "release" de Veloren, qui est plus ancienne que celle du serveur officiel. Il vous faudra télécharger la version correspondante du client: - * [Windows x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=windows) - * [Linux x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=linux) - * [MacOS x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.12.0/download?job=macos) + * [Windows x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=windows) + * [Linux x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=linux) + * [MacOS x64](https://gitlab.com/veloren/veloren/-/jobs/artifacts/v0.13.0/download?job=macos) diff --git a/manifest.json b/manifest.json index f6869b9..2a6a850 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Multiplayer voxel RPG inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft", "fr": "RPG voxel multijoueur inspiré de jeux tels que Cube World, Legend of Zelda : Breath of the Wild, Dwarf Fortress et Minecraft" }, - "version": "0.12.0~ynh1", + "version": "0.13.0~ynh1", "url": "https://veloren.net", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index eec4427..c424c86 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,6 +7,8 @@ # dependencies used by the app pkg_dependencies="ca-certificates librust-backtrace+libbacktrace-dev build-essential git git-lfs" +nix_git_hash="34ae5b9d/2022-07-23-08:55" + #================================================= # PERSONAL HELPERS #================================================= @@ -74,6 +76,10 @@ function set_permissions { } function install_rust { + ynh_secure_remove --file="$final_path/.cargo" + ynh_secure_remove --file="$final_path/.rustup" + ynh_secure_remove --file="$data_path/.cargo" + ynh_secure_remove --file="$data_path/.rustup" ynh_exec_warn_less ynh_exec_as "$app" RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain stable' } @@ -83,7 +89,7 @@ function compile_server { chown -R $app:$app "$final_path" export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin" pushd "$final_path/build" - ynh_exec_warn_less ynh_exec_as "$app" env PATH="$PATH" NIX_GIT_HASH="cf2bdb20/2021-06-12-08:55" NIX_GIT_TAG="v0.10.0" VELOREN_ASSETS="$final_path/build/assets" RUSTFLAGS="-D warnings" VELOREN_USERDATA_STRATEGY=system cargo build --bin veloren-server-cli --release + ynh_exec_warn_less ynh_exec_as "$app" env PATH="$PATH" NIX_GIT_HASH="$nix_git_hash" NIX_GIT_TAG="v$(ynh_app_upstream_version)" VELOREN_ASSETS="$final_path/build/assets" RUSTFLAGS="-D warnings" VELOREN_USERDATA_STRATEGY=system cargo build --bin veloren-server-cli --release popd ynh_secure_remove --file="$final_path/live"