Merge pull request #304 from YunoHost-Apps/master-promotion

Upgrade master from testing
2024-09-03 19:26:16 +02:00 · 2024-03-08 15:01:10 +00:00 · 2024-03-08 15:01:10 +00:00 · 2935e055ce
commit 2935e055ce
parent a4659a43b2 c9587ba729
8 changed files with 49 additions and 163 deletions
--- a/.github/workflows/package_linter.yml
+++ b/.github/workflows/package_linter.yml
@ -5,19 +5,19 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - main
+      - master-promotion
  pull_request:
  schedule:
    - cron: '0 8 * * *'

 jobs:
-  test:
+  packageLinter:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      
      - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
        with:
          python-version: '3.9'
      
--- a/.github/workflows/update_master.yml
+++ b/.github/workflows/update_master.yml
@ -10,7 +10,7 @@ jobs:
  masterPromotion:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          ref: master
      - name: Reset promotion branch
@ -18,7 +18,7 @@ jobs:
          git fetch origin testing:testing
          git reset --hard testing
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
        with:
          branch: master-promotion
          title: 'Upgrade master from testing'
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@ -1,78 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# PACKAGE UPDATING HELPER
-#=================================================
-
-# This script is meant to be run by GitHub Actions
-# The YunoHost-Apps organisation offers a template Action to run this script periodically
-# Since each app is different, maintainers can adapt its contents so as to perform
-# automatic actions when a new upstream release is detected.
-
-# Remove this exit command when you are ready to run this Action
-#exit 1
-
-#=================================================
-# FETCHING LATEST RELEASE AND ITS ASSETS
-#=================================================
-
-# Fetching information
-app=$(cat manifest.toml | tomlq -j '.id')
-current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]')
-upstream_version=$(curl -Ls https://pypi.org/pypi/$app/json | jq -r .info.version)
-
-# Setting up the environment variables
-echo "Current version: $current_version"
-echo "Latest release from upstream: $upstream_version"
-echo "VERSION=$upstream_version" >> $GITHUB_ENV
-# For the time being, let's assume the script will fail
-echo "PROCEED=false" >> $GITHUB_ENV
-
-# Proceed only if the retrieved version is greater than the current one
-if ! dpkg --compare-versions "$current_version" "lt" "$upstream_version"
-then
-	echo "::warning :: No new version available"
-	exit 0
-# Proceed only if a PR for this new version does not already exist
-elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$upstream_version
-then
-	echo "::warning ::A branch already exists for this update"
-	exit 0
-fi
-
-#=================================================
-# SPECIFIC UPDATE STEPS
-#=================================================
-
-# Replace new version in _common.sh
-sed -i "s/^app_version=.*/app_version=$upstream_version/" scripts/_common.sh
-
-# Replace python required version
-py_required_major=$(curl -Ls https://pypi.org/pypi/$app/json | jq -r .info.requires_python | cut -d '=' -f 2 | rev | cut -d"." -f2-  | rev)
-py_required_minor=$(curl -s "https://www.python.org/ftp/python/" | grep ">$py_required_major"  | cut -d '/' -f 2 | cut -d '>' -f 2 | sort -rV | head -n 1)
-current_py_required_minor=$(cat scripts/_common.sh | grep "py_required_version=" | cut -d '=' -f 2)
-if ! dpkg --compare-versions "$current_py_required_minor" "lt" "$py_required_minor"
-then
-	echo "::warning :: No need to update required python version"
-else
-	echo "::warning :: Updating required python version to new upstream python version"
-	sed -i "s/^py_required_version=.*/py_required_version=$py_required_minor/" scripts/_common.sh
-fi
-# Replace pip required version
-pip_required=$(curl -Ls https://pypi.org/pypi/$app/json | jq -r .info.requires_dist[] | grep "pip") #"pip (<23.1,>=21.0)"
-sed -i "s/^pip_required=.*/pip_required=\"$pip_required\"/" scripts/_common.sh
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-
-# Replace new version in manifest
-sed -i "s/^version = .*/version = \"$upstream_version~ynh1\"/" manifest.toml
-#DOES NOT WORK BECAUSE IT REORDER ALL THE MANIFEST IN A STRANGE WAY
-#echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > manifest.toml 
-
-# No need to update the README, yunohost-bot takes care of it
-
-# The Action will proceed only if the PROCEED environment variable is set to true
-echo "PROCEED=true" >> $GITHUB_ENV
-exit 0
--- a/.github/workflows/updater.yml
+++ b/.github/workflows/updater.yml
@ -1,55 +0,0 @@
-# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
-# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
-# This file should be enough by itself, but feel free to tune it to your needs.
-# It calls updater.sh, which is where you should put the app-specific update steps.
-name: Check for new upstream releases
-on:
-  # Allow to manually trigger the workflow
-  workflow_dispatch:
-  # Run it every day at 6:00 UTC
-  schedule:
-    - cron:  '0 6 */7 * *'
-jobs:
-  updater:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch the source code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Install python
-        uses: actions/setup-python@v4
-      - name: Install yq/tomlq
-        id: install_yq
-        run: pip install yq
-      - name: Run the updater script
-        id: run_updater
-        run: |
-          # Setting up Git user
-          git config --global user.name 'yunohost-bot'
-          git config --global user.email 'yunohost-bot@users.noreply.github.com'
-          # Run the updater script
-          /bin/bash .github/workflows/updater.sh
-      - name: Commit changes
-        id: commit
-        if: ${{ env.PROCEED == 'true' }}
-        run: |
-          git commit -am "Upgrade to v$VERSION"
-      - name: Create Pull Request
-        id: cpr
-        if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update to version ${{ env.VERSION }}
-          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          signoff: false
-          base: testing
-          branch: ci-auto-update-v${{ env.VERSION }}
-          delete-branch: true
-          title: 'Upgrade to version ${{ env.VERSION }}'
-          body: |
-            Upgrade to v${{ env.VERSION }}
-            [See upstream release page](https://github.com/home-assistant/core/releases/tag/${{ env.VERSION }})
-          draft: false
--- a/README.md
+++ b/README.md
@ -27,10 +27,9 @@ Home Assistant is an open source home automation that puts local control and pri
 - Companion Mobile Apps ;
 - Home Energy Management." 

+**Shipped version:** 2024.2.5~ynh2

-**Shipped version:** 2024.2.5~ynh1
-
-**Demo:** https://demo.home-assistant.io
+**Demo:** <https://demo.home-assistant.io>

 ## Screenshots

@ -38,11 +37,11 @@ Home Assistant is an open source home automation that puts local control and pri

 ## Documentation and resources

-* Official app website: <https://www.home-assistant.io>
-* Official admin documentation: <https://www.home-assistant.io/docs/>
-* Upstream app code repository: <https://github.com/home-assistant/core>
-* YunoHost Store: <https://apps.yunohost.org/app/homeassistant>
-* Report a bug: <https://github.com/YunoHost-Apps/homeassistant_ynh/issues>
+- Official app website: <https://www.home-assistant.io>
+- Official admin documentation: <https://www.home-assistant.io/docs/>
+- Upstream app code repository: <https://github.com/home-assistant/core>
+- YunoHost Store: <https://apps.yunohost.org/app/homeassistant>
+- Report a bug: <https://github.com/YunoHost-Apps/homeassistant_ynh/issues>

 ## Developer info

@ -56,4 +55,4 @@ or
 sudo yunohost app upgrade homeassistant -u https://github.com/YunoHost-Apps/homeassistant_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -26,10 +26,9 @@ Home Assistant zst une application domotique open source qui donne la priorité
 - Toutes les données de votre maison intelligente restent locales ;
 - Applications mobiles compagnons ;
 - Gestion de l'énergie domestique.
+**Version incluse :** 2024.2.5~ynh2

-**Version incluse :** 2024.2.5~ynh1
-
-**Démo :** https://demo.home-assistant.io
+**Démo :** <https://demo.home-assistant.io>

 ## Captures d’écran

@ -37,11 +36,11 @@ Home Assistant zst une application domotique open source qui donne la priorité

 ## Documentations et ressources

-* Site officiel de l’app : <https://www.home-assistant.io>
-* Documentation officielle de l’admin : <https://www.home-assistant.io/docs/>
-* Dépôt de code officiel de l’app : <https://github.com/home-assistant/core>
-* YunoHost Store: <https://apps.yunohost.org/app/homeassistant>
-* Signaler un bug : <https://github.com/YunoHost-Apps/homeassistant_ynh/issues>
+- Site officiel de l’app : <https://www.home-assistant.io>
+- Documentation officielle de l’admin : <https://www.home-assistant.io/docs/>
+- Dépôt de code officiel de l’app : <https://github.com/home-assistant/core>
+- YunoHost Store : <https://apps.yunohost.org/app/homeassistant>
+- Signaler un bug : <https://github.com/YunoHost-Apps/homeassistant_ynh/issues>

 ## Informations pour les développeurs

@ -55,4 +54,4 @@ ou
 sudo yunohost app upgrade homeassistant -u https://github.com/YunoHost-Apps/homeassistant_ynh/tree/testing --debug
 ```

-**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +5,7 @@ name = "Home Assistant"
 description.en = "Home automation platform"
 description.fr = "Plateforme domotique"

-version = "2024.2.5~ynh1"
+version = "2024.2.5~ynh2"

 maintainers = ["ewilly"]

@ -77,6 +77,14 @@ ram.runtime = "2G"
    default = "America/Los_Angeles"

 [resources]
+    [resources.sources]
+
+        [resources.sources.main]
+        url = "https://github.com/home-assistant/core/archive/refs/tags/2024.2.5.tar.gz"
+        sha256 = "cb65a0c60621688eab43b646e545d2a991cd9eacc65e02d3a39d0ddbd5a645d4"
+
+        autoupdate.strategy = "latest_github_release"
+
    [resources.system_user]

    [resources.install_dir]
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,12 +4,22 @@
 # COMMON VARIABLES
 #=================================================

-# Release to install
-app_version=2024.2.5
+# App version
+## yq is not a dependencie of yunohost package so tomlq command is not available
+## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
+app_version=$(cat ../manifest.toml 2>/dev/null \
+				| grep 'version = ' | cut -d '=' -f 2 \
+				| cut -d '~' -f 1 | tr -d ' "') #2024.2.5

-# Requirements
-py_required_version=3.11.8
-pip_required="pip (>=21.3.1)"
+# Python required version
+## jq is a dependencie of yunohost package
+## (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
+py_required_major=$(curl -Ls https://pypi.org/pypi/$app/$app_version/json \
+						| jq -r '.info.requires_python' | cut -d '=' -f 2 \
+						| rev | cut -d '.' -f2-  | rev) #3.11
+py_required_version=$(curl -Ls https://www.python.org/ftp/python/ \
+						| grep '>'$py_required_major  | cut -d '/' -f 2 \
+						| cut -d '>' -f 2 | sort -rV | head -n 1) #3.11.8

 # Fail2ban
 failregex="^%(__prefix_line)s.*\[homeassistant.components.http.ban\] Login attempt or request with invalid authentication from.* \(<HOST>\).* Requested URL: ./auth/.*"
@ -113,6 +123,9 @@ myynh_install_python () {
 	
 # Install/Upgrade Homeassistant in virtual environement
 myynh_install_homeassistant () {
+	# Requirements
+	pip_required=$(curl -Ls https://pypi.org/pypi/$app/$app_version/json | jq -r '.info.requires_dist[]' | grep 'pip') #pip (<23.1,>=21.0)
+
 	# Create the virtual environment
 	ynh_exec_as $app $py_app_version -m venv --without-pip "$install_dir"