From 0db6a281f822a4d86149843506e8d3043ad792ff Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 15 Aug 2023 10:28:24 +0200 Subject: [PATCH] package version 2 --- .github/workflows/updater.sh | 135 ---------------------------------- .github/workflows/updater.yml | 50 ------------- manifest.toml | 22 +++--- scripts/_common.sh | 5 +- scripts/install | 10 --- 5 files changed, 15 insertions(+), 207 deletions(-) delete mode 100644 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100644 index d31df1d..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/bash - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -#Installing tomlq -python3 -m venv venv -source venv/bin/activate -pip3 install tomlq - -# Fetching information -current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]') -repo=$(cat manifest.toml | tomlq -j '.upstream.code|split("https://github.com/")[1]') -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) -assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$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" "$version" ; then - echo "::warning ::No new version available" - rm -rf ./venv - 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$version ; then - echo "::warning ::A branch already exists for this update" - rm -rf ./venv - exit 0 -fi - -# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) -echo "${#assets[@]} available asset(s)" - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Here we use the $assets variable to get the resources published in the upstream release. -# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. - -# Let's loop over the array of assets URLs -for asset_url in ${assets[@]}; do - -echo "Handling asset at $asset_url" - -# Assign the asset to a source file in conf/ directory -# Here we base the source file name upon a unique keyword in the assets url -# Leave $src empty to ignore the asset -case $asset_url in - *"arm64.tgz"*) - src="arm64" - ;; - *"armhf.tgz"*) - src="armhf" - ;; - *"x86_64.tgz"*) - src="amd64" - ;; - *"x86.tgz"*) - src="i386" - ;; - *) - src="" - ;; -esac - -# If $src is not empty, let's process the asset -if [ ! -z "$src" ]; then - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tgz ]]; then - extension=tgz -else - extension=${filename##*.} -fi - -#update manifest -sed -i "s|$src.url =.*|$src.url = \"$asset_url\"|" manifest.toml -sed -i "s/$src.sha256 =*./$src.sha256 = \"$checksum\"/" manifest.toml - -echo "... Source updated in manifest.toml" - -else -echo "... asset ignored" -fi - -done - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -sed -i "s/^version\s*=.*/version = \"$version~ynh1\"/" manifest.toml - -# No need to update the README, yunohost-bot takes care of it - -#remove the venv folder -rm -rf ./venv - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index 4a866ff..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,50 +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 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - 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 ' - author: 'yunohost-bot ' - 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/${{ env.REPO }}/releases/tag/v${{ env.VERSION }}) - draft: false diff --git a/manifest.toml b/manifest.toml index e4cd5bb..d29c646 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,12 +5,12 @@ name = "Universal Media Server" description.en = "A DLNA, UPnP and HTTP(S) Media Server" description.fr = "Un Serveur Multimedia DLNA, UPnP et HTTP(S)" -version = "13.2.0~ynh3" +version = "13.5.0~ynh2" maintainers = ["Krakinou"] [upstream] -version = "13.2.0" +version = "13.5.0" license = "GPL-2.0-or-later" website = "www.universalmediaserver.com" admindoc = "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki" @@ -58,14 +58,14 @@ ram.runtime = "50M" [resources] [resources.sources.main] - arm64.url = "https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/13.2.0/UMS-13.2.0-arm64.tgz" - arm64.sha256 = "f2b05cec5fa6e51b9b5e1884b1ecdb99ca4e11bc0793a5cbea66c0f5c7e03a1a" - amd64.url = "https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/13.2.0/UMS-13.2.0-x86_64.tgz" - amd64.sha256 = "1b009c7deb737641e173a0a82c0b105d8e33a4392de661562e156e4434a4ed17" - armhf.url = "https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/13.2.0/UMS-13.2.0-armhf.tgz" - armhf.sha256 = "5e478d40336600517a6f765c49c45bb81c627b76113b571d3ae09e9457429b3e" - i386.url = "https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/13.2.0/UMS-13.2.0-x86.tgz" - i386.sha256 = "91a5c534664441064c772dcace5bcef02edac82d8d3c67155ddd803deabeb52c" + arm64.url = "https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/13.5.0/UMS-13.5.0-arm64.tgz" + arm64.sha256 = "b916a56a24e70d5454cbffdbd6140e4d20837f1187e6f6f437574c0244b100de" + amd64.url = "https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/13.5.0/UMS-13.5.0-x86_64.tgz" + amd64.sha256 = "1243c598fa2b3c4790399e7a13656b85fefefbe76c6332a38c7ae6bf15355c7b" + armhf.url = "https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/13.5.0/UMS-13.5.0-armhf.tgz" + armhf.sha256 = "ac00cf598c0e1b572416c289ec36bb1578993fdf45348faf70558be2ecedb12b" + i386.url = "https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/13.5.0/UMS-13.5.0-x86.tgz" + i386.sha256 = "4535f500d19916aaf4c4d88d8448e8363898fbec81fac250db95b585f9542b8d" autoupdate.strategy = "latest_github_release" @@ -90,4 +90,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mediainfo dcraw p7zip" + packages = "mediainfo dcraw" diff --git a/scripts/_common.sh b/scripts/_common.sh index 69c72c9..2f239f9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,10 @@ #================================================= # COMMON VARIABLES #================================================= - +if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]] +then + pkg_dependencies+=" openjdk-17-jre" +fi #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 194c818..74fd018 100755 --- a/scripts/install +++ b/scripts/install @@ -15,16 +15,6 @@ source /usr/share/yunohost/helpers upstream_version=$(ynh_app_upstream_version) -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --weight=30 - -if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]] -then - pkg_dependencies+="openjdk-17-jre" -fi - #================================================= #SETTING MULTIMEDIA DIRECTORY #=================================================