From 117b7642ce397ee79ae69491cf03b5c603014f96 Mon Sep 17 00:00:00 2001 From: ewilly Date: Sat, 8 Jan 2022 16:21:01 +0100 Subject: [PATCH 1/7] Activate updater.sh --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 794ae6e..f092dbd 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -10,7 +10,7 @@ # 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 From ecfda32aae22f79041ce16b4a2ca81e41b7c9261 Mon Sep 17 00:00:00 2001 From: ewilly Date: Tue, 18 Jan 2022 21:07:42 +0100 Subject: [PATCH 2/7] Update updater.sh --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index f092dbd..7706751 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -19,7 +19,7 @@ # Fetching information app=$(cat manifest.json | jq -j '.id') current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -upstream_version=$(curl -Ls https://pypi.org/pypi/$pythonPackage/json | jq -r .info.version) +upstream_version=$(curl -Ls https://pypi.org/pypi/$app/json | jq -r .info.version) # Setting up the environment variables echo "Current version: $current_version" From b2ab8a0db97a5b365259f9ae9d1ee2c910448289 Mon Sep 17 00:00:00 2001 From: ewilly Date: Tue, 18 Jan 2022 21:35:01 +0100 Subject: [PATCH 3/7] Update updater.sh --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 7706751..2f7072a 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -43,7 +43,7 @@ fi #================================================= # Replace new version in _common.sh -sed -i "s/app_version=.*/app_version=$upstream_version/" scripts/_common.sh +sed -i "s/^app_version=.*/app_version=$upstream_version/" scripts/_common.sh #================================================= # GENERIC FINALIZATION From b6968791014a7e559a8254d772a1591a5e78d241 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 18 Jan 2022 20:35:26 +0000 Subject: [PATCH 4/7] Upgrade to v2021.12.10 --- manifest.json | 86 +++++++++++++++++++++++----------------------- scripts/_common.sh | 2 +- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/manifest.json b/manifest.json index f123730..5fd2687 100644 --- a/manifest.json +++ b/manifest.json @@ -1,47 +1,47 @@ { - "name": "Home Assistant", - "id": "homeassistant", - "packaging_format": 1, - "description": { - "en": "Home automation platform", - "fr": "Plateforme domotique" - }, - "version": "2021.12.8~ynh1", - "url": "https://github.com/home-assistant/home-assistant", - "upstream": { + "name": "Home Assistant", + "id": "homeassistant", + "packaging_format": 1, + "description": { + "en": "Home automation platform", + "fr": "Plateforme domotique" + }, + "version": "2021.12.10~ynh1", + "url": "https://github.com/home-assistant/home-assistant", + "upstream": { + "license": "Apache-2.0", + "website": "https://www.home-assistant.io", + "demo": "https://demo.home-assistant.io", + "admindoc": "https://www.home-assistant.io/docs/", + "code": "https://github.com/home-assistant/core" + }, "license": "Apache-2.0", - "website": "https://www.home-assistant.io", - "demo": "https://demo.home-assistant.io", - "admindoc": "https://www.home-assistant.io/docs/", - "code": "https://github.com/home-assistant/core" - }, - "license": "Apache-2.0", - "maintainer": { - "name": "ewilly", - "email": "ewilly@ewilly.fr" - }, - "requirements": { + "maintainer": { + "name": "ewilly", + "email": "ewilly@ewilly.fr" + }, + "requirements": { "yunohost": ">= 4.3.0" - }, - "multi_instance": false, - "services": [ - "nginx" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "is_public", - "type": "boolean", - "help": { - "en": "If not public, Smartphone app will not work", - "fr": "Dans le cas contraire, l'application sur Smartphone ne fonctionnera pas" - }, - "default": true - } - ] - } + }, + "multi_instance": false, + "services": [ + "nginx" + ], + "arguments": { + "install": [ + { + "name": "domain", + "type": "domain" + }, + { + "name": "is_public", + "type": "boolean", + "help": { + "en": "If not public, Smartphone app will not work", + "fr": "Dans le cas contraire, l'application sur Smartphone ne fonctionnera pas" + }, + "default": true + } + ] + } } diff --git a/scripts/_common.sh b/scripts/_common.sh index 25fb00f..10e86ec 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Release to install -app_version=2021.12.8 +app_version=2021.12.10 # Package dependencies pkg_dependencies="python3 python3-dev python3-venv python3-pip libffi-dev libssl-dev libjpeg-dev zlib1g-dev autoconf build-essential libopenjp2-7 libtiff5 libturbojpeg0 libmariadb-dev libmariadb-dev-compat" From 4e9b836574ce14d9e982cc0364573b29b9d420e9 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 18 Jan 2022 20:35:31 +0000 Subject: [PATCH 5/7] 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 8a24dbb..efd54ef 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Home automation platform -**Shipped version:** 2021.12.8~ynh1 +**Shipped version:** 2021.12.10~ynh1 **Demo:** https://demo.home-assistant.io diff --git a/README_fr.md b/README_fr.md index c880c2c..9c6e52d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme domotique -**Version incluse :** 2021.12.8~ynh1 +**Version incluse :** 2021.12.10~ynh1 **Démo :** https://demo.home-assistant.io From ddf951399bba532ba9d153a55cacc0ddd60d8408 Mon Sep 17 00:00:00 2001 From: ewilly Date: Thu, 20 Jan 2022 20:55:09 +0100 Subject: [PATCH 6/7] Update upgrade_homeassistant.sh --- conf/homeassistant_conf_files/bin/upgrade_homeassistant.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/homeassistant_conf_files/bin/upgrade_homeassistant.sh b/conf/homeassistant_conf_files/bin/upgrade_homeassistant.sh index 36e08c5..fbb00e3 100755 --- a/conf/homeassistant_conf_files/bin/upgrade_homeassistant.sh +++ b/conf/homeassistant_conf_files/bin/upgrade_homeassistant.sh @@ -42,10 +42,10 @@ fi # Check User and permissions [ ! -z "$DEBUG" ] && log "User '$(whoami)' is running that script and '$(has_sudo)'." -# create the virtual environment +# upgrade the virtual environment MY_PYTHON=$(readlink -e "$final_path/bin/python") [ ! -z "$DEBUG" ] && log "Using pyhton '$MY_PYTHON'." -$MY_PYTHON -m venv "$final_path" +$MY_PYTHON -m venv --upgrade "$final_path" # activate the virtual environment source "$final_path/bin/activate" @@ -53,6 +53,9 @@ source "$final_path/bin/activate" # install last version of wheel pip --cache-dir "$data_path/.cache" install --upgrade wheel +# install last version of mysqlclient +pip --cache-dir "$data_path/.cache" install --upgrade mysqlclient + # upgrade homeassistant python package pip --cache-dir "$data_path/.cache" install --upgrade $app From 48d9c9727da64b825dbf33f2028303a9a3cac8c5 Mon Sep 17 00:00:00 2001 From: ewilly Date: Thu, 20 Jan 2022 21:00:35 +0100 Subject: [PATCH 7/7] Update updater.yml --- .github/workflows/updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index fb72ba0..2f8a4c8 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -40,7 +40,7 @@ jobs: committer: 'yunohost-bot ' author: 'yunohost-bot ' signoff: false - base: testing + base: master branch: ci-auto-update-v${{ env.VERSION }} delete-branch: true title: 'Upgrade to version ${{ env.VERSION }}'