From 278fe9391691e5a55fcb4f236dcd70348683dbef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Mar 2022 13:15:08 +0100 Subject: [PATCH 1/3] 0.12.6 --- .github/workflows/updater.sh | 6 +++--- conf/amd64.src | 4 ++-- conf/armhf.src | 4 ++-- conf/i386.src | 4 ++-- manifest.json | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 1db46d5..78ae310 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -66,13 +66,13 @@ echo "Handling asset at $asset_url" # 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 - *"gogs_"*"_linux_amd64.zip") + *"gogs_"*"_linux_amd64.tar.gz") src="amd64" ;; - *"gogs_"*"_linux_armv7.zip") + *"gogs_"*"_linux_armv7.tar.gz") src="armhf" ;; - *"gogs_"*"_linux_386.zip") + *"gogs_"*"_linux_386.tar.gz") src="i386" ;; esac diff --git a/conf/amd64.src b/conf/amd64.src index 5c81491..27e6f83 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/gogs/gogs/releases/download/v0.12.5/gogs_0.12.5_linux_amd64.tar.gz -SOURCE_SUM=1a6227f05630bc514d6e131e97f3ae134eb404cb9753262ea8191290f9ee35b1 +SOURCE_URL=https://github.com/gogs/gogs/releases/download/v0.12.6/gogs_0.12.6_linux_amd64.tar.gz +SOURCE_SUM=591f16331776d02575a11ff135739e44a46e1811b7a7a5c9871bad7bcc47c664 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/armhf.src b/conf/armhf.src index 23aff62..4dae1e8 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/gogs/gogs/releases/download/v0.12.5/gogs_0.12.5_linux_armv7.tar.gz -SOURCE_SUM=34e6d901e6164b97df274fcb7a29ce5f8fdf73af68389663b8aae15986e06d43 +SOURCE_URL=https://github.com/gogs/gogs/releases/download/v0.12.6/gogs_0.12.6_linux_armv7.tar.gz +SOURCE_SUM=ee58e5ad8db23406474bded1606c61b822aaedb2a1350aed7403d8958bf3a8f1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/i386.src b/conf/i386.src index f2c5457..2fdde44 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/gogs/gogs/releases/download/v0.12.5/gogs_0.12.5_linux_386.tar.gz -SOURCE_SUM=46ef6df0eac1018272db51e55497507a0f44643b9bcc1721181bf18c63c5fbdb +SOURCE_URL=https://github.com/gogs/gogs/releases/download/v0.12.6/gogs_0.12.6_linux_386.tar.gz +SOURCE_SUM=f29320024ad1542022b208909e7a00381355fed9696664a080d296f1faea3eed SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index ef1b582..d98a556 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Lightweight self-hosted Git forge", "fr": "Forge Git légère auto-hébergé" }, - "version": "0.12.5~ynh1", + "version": "0.12.6~ynh1", "url": "http://gogs.io", "upstream": { "license": "MIT", From fee0e8a3ff99e7b7bb26b3cf88832495356be8d6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 20 Mar 2022 12:15:13 +0000 Subject: [PATCH 2/3] 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 d063a9b..c30c88d 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Gogs (Go Git Service) is a git-based multiplatform forge written in Go. Its part - Customize HTML templates, static files and many others. -**Shipped version:** 0.12.5~ynh1 +**Shipped version:** 0.12.6~ynh1 **Demo:** https://try.gogs.io/user/login diff --git a/README_fr.md b/README_fr.md index ed20be9..de6d52c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Gogs (Go Git Service) est une forge multiplateforme basée sur git écrite en Go. Sa particularité est d’être léger et pouvant fonctionner sur carte ARM, ce qui fait qu’il est adapté à l’auto-hébergement. Gogs a une interface web similaire à celle de GitHub. -**Version incluse :** 0.12.5~ynh1 +**Version incluse :** 0.12.6~ynh1 **Démo :** https://try.gogs.io/user/login From a0fdf1bfce9e67592f8c27d74dc7885341d3e5c8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Mar 2022 15:34:31 +0100 Subject: [PATCH 3/3] cleaning --- scripts/install | 3 +-- scripts/upgrade | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 14a969f..2e54628 100644 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,6 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -architecture=$YNH_ARCH key=$(ynh_string_random) app=$YNH_APP_INSTANCE_NAME @@ -87,7 +86,7 @@ ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir=$final_path --source_id="$architecture" +ynh_setup_source --dest_dir=$final_path --source_id=$YNH_ARCH chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index 2df888a..2d827fd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,7 +26,6 @@ db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) admin=$(ynh_app_setting_get --app=$app --key=admin) port=$(ynh_app_setting_get --app=$app --key=port) -architecture=$YNH_ARCH datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= @@ -84,7 +83,7 @@ ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir=$final_path --source_id="$architecture" --keep="$final_path/custom/conf/app.ini $final_path/custom/conf/auth.d/ldap.conf" +ynh_setup_source --dest_dir=$final_path --source_id=$YNH_ARCH --keep="$final_path/custom/conf/app.ini $final_path/custom/conf/auth.d/ldap.conf" chmod 750 "$final_path" chmod -R o-rwx "$final_path"