mirror of
https://github.com/YunoHost-Apps/scrutiny_ynh.git
synced 2024-09-03 20:16:24 +02:00
Merge pull request #16 from YunoHost-Apps/master-promotion
Upgrade master from testing
This commit is contained in:
ewilly
GitHub
commit
ccc564e8ad
14 changed files with 50 additions and 286 deletions
171
.github/workflows/updater.sh
vendored
171
.github/workflows/updater.sh
vendored
|
|
@ -1,171 +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
|
||||
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
|
||||
echo "REPO=$repo" >> $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"
|
||||
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"
|
||||
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
|
||||
|
||||
filename=${asset_url##*/}
|
||||
echo "Handling asset $filename 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 (admin vs. update)
|
||||
# Leave $src empty to ignore the asset
|
||||
case $asset_url in
|
||||
*"scrutiny-web-frontend.tar.gz"*)
|
||||
#arch=""
|
||||
;;
|
||||
*"scrutiny-web-linux-amd64"*)
|
||||
#arch="amd64"
|
||||
;;
|
||||
*"scrutiny-web-linux-arm64"*)
|
||||
#arch="arm64"
|
||||
;;
|
||||
*"scrutiny-collector-metrics-linux-amd64"*)
|
||||
#arch="amd64"
|
||||
;;
|
||||
*"scrutiny-collector-metrics-linux-arm64"*)
|
||||
#arch="arm64"
|
||||
;;
|
||||
*)
|
||||
filename=""
|
||||
;;
|
||||
esac
|
||||
|
||||
# If $src is not empty, let's process the asset
|
||||
if [ ! -z "$filename" ]
|
||||
then
|
||||
|
||||
# Create the temporary directory
|
||||
tempdir="$(mktemp -d)"
|
||||
|
||||
# Download sources and calculate checksum
|
||||
curl --silent -4 -L $asset_url -o "$tempdir/$filename"
|
||||
checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
|
||||
|
||||
# Delete temporary directory
|
||||
rm -rf $tempdir
|
||||
|
||||
#DOES NOT WORK BECAUSE IT REORDER ALL THE MANIFEST IN A STRANGE WAY
|
||||
# Rewrite sources in manifest.toml
|
||||
# if [ -z "$arch" ]
|
||||
# then
|
||||
# echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .resources.sources.$src.url = \"$asset_url\"" manifest.toml)" > manifest.toml
|
||||
# echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .resources.sources.$src.sha256 = \"$checksum\"" manifest.toml)" > manifest.toml
|
||||
# else
|
||||
# echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .resources.sources.$src.$arch.url = \"$asset_url\"" manifest.toml)" > manifest.toml
|
||||
# echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .resources.sources.$src.$arch.sha256 = \"$checksum\"" manifest.toml)" > manifest.toml
|
||||
# fi
|
||||
|
||||
# Get extension
|
||||
if [[ $filename == *.tar.gz ]]
|
||||
then
|
||||
extension="tar.gz"
|
||||
subdir=true
|
||||
extract=true
|
||||
else
|
||||
extension="binary"
|
||||
subdir=""
|
||||
extract=false
|
||||
fi
|
||||
|
||||
# Rewrite source file
|
||||
cat <<EOT > conf/src/$filename.src
|
||||
SOURCE_URL=$asset_url
|
||||
SOURCE_SUM=$checksum
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=$extension
|
||||
SOURCE_IN_SUBDIR=$subdir
|
||||
SOURCE_EXTRACT=$extract
|
||||
EOT
|
||||
echo "... conf/src/$filename.src updated"
|
||||
|
||||
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 --in-place "s/^version = .*/version = \"$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
|
||||
55
.github/workflows/updater.yml
vendored
55
.github/workflows/updater.yml
vendored
|
|
@ -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 * * *'
|
||||
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/${{ env.REPO }}/releases/tag/v${{ env.VERSION }})
|
||||
draft: false
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<!--
|
||||
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
|
||||
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
|
||||
It shall NOT be edited by hand.
|
||||
-->
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
|
|||
- (Future) Hard Drive performance testing & tracking
|
||||
|
||||
|
||||
**Shipped version:** 0.7.2~ynh2
|
||||
**Shipped version:** 0.7.3~ynh1
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
|
@ -60,4 +60,4 @@ or
|
|||
sudo yunohost app upgrade scrutiny -u https://github.com/YunoHost-Apps/scrutiny_ynh/tree/testing --debug
|
||||
```
|
||||
|
||||
**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
|
||||
**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<!--
|
||||
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
|
||||
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
|
||||
It shall NOT be edited by hand.
|
||||
-->
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
|
|||
- (Future) Hard Drive performance testing & tracking
|
||||
|
||||
|
||||
**Version incluse :** 0.7.2~ynh2
|
||||
**Version incluse :** 0.7.3~ynh1
|
||||
|
||||
## Captures d’écran
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.7.2/scrutiny-collector-metrics-linux-amd64
|
||||
SOURCE_SUM=6872d555f8cf82c9eaec795fe5b059d48461fa3268c60f3cdfefff5a63f96550
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=binary
|
||||
SOURCE_IN_SUBDIR=
|
||||
SOURCE_EXTRACT=false
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.7.2/scrutiny-collector-metrics-linux-arm64
|
||||
SOURCE_SUM=1464197db024c89fdac7155375162faedbfb4ea940e65c903d0f8abdac6b8a59
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=binary
|
||||
SOURCE_IN_SUBDIR=
|
||||
SOURCE_EXTRACT=false
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.7.2/scrutiny-web-frontend.tar.gz
|
||||
SOURCE_SUM=8754155e5bdac316acdf775b332faf321bc35d40c27f61469206a68086de2af4
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=tar.gz
|
||||
SOURCE_IN_SUBDIR=true
|
||||
SOURCE_EXTRACT=true
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.7.2/scrutiny-web-linux-amd64
|
||||
SOURCE_SUM=8bc3e7cd8c51eb41847569e1d752866334d56b9e6eec40f9d32e61d5f3b0f86d
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=binary
|
||||
SOURCE_IN_SUBDIR=
|
||||
SOURCE_EXTRACT=false
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.7.2/scrutiny-web-linux-arm64
|
||||
SOURCE_SUM=b39b62be3c5b69d3dc4fce493f2646719ebcd52699f6c8e04ae93321460e4406
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
SOURCE_FORMAT=binary
|
||||
SOURCE_IN_SUBDIR=
|
||||
SOURCE_EXTRACT=false
|
||||
|
|
@ -10,7 +10,7 @@ Group=root
|
|||
WorkingDirectory=__INSTALL_DIR__
|
||||
LogsDirectory=__APP__
|
||||
StateDirectory=__APP__
|
||||
ExecStart=__INSTALL_DIR__/bin/scrutiny-collector-metrics-linux-__YNH_ARCH__ run --config __INSTALL_DIR__/config/collector.yaml
|
||||
ExecStart=__INSTALL_DIR__/bin/scrutiny-collector-metrics-linux run --config __INSTALL_DIR__/config/collector.yaml
|
||||
Restart=no
|
||||
StandardOutput=append:/var/log/__APP__/collector.log
|
||||
StandardError=inherit
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ Group=__APP__
|
|||
WorkingDirectory=__INSTALL_DIR__
|
||||
LogsDirectory=__APP__
|
||||
StateDirectory=__APP__
|
||||
ExecStart=__INSTALL_DIR__/bin/scrutiny-web-linux-__YNH_ARCH__ start --config __INSTALL_DIR__/config/scrutiny.yaml
|
||||
ExecStart=__INSTALL_DIR__/bin/scrutiny-web-linux start --config __INSTALL_DIR__/config/scrutiny.yaml
|
||||
Restart=always
|
||||
RestartSec=10s
|
||||
StandardOutput=append:/var/log/__APP__/web-server.log
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ id = "scrutiny"
|
|||
name = "Scrutiny"
|
||||
description.en = "WebUI for smartd S.M.A.R.T monitoring"
|
||||
|
||||
version = "0.7.2~ynh2"
|
||||
version = "0.7.3~ynh1"
|
||||
|
||||
maintainers = ["ewilly"]
|
||||
|
||||
|
|
@ -39,6 +39,38 @@ ram.runtime = "50M"
|
|||
default = true
|
||||
|
||||
[resources]
|
||||
[resources.sources]
|
||||
|
||||
[resources.sources.scrutiny-web-linux]
|
||||
in_subdir = false
|
||||
amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-linux-amd64"
|
||||
amd64.sha256 = "42071cb77bd04a608d35e5a6ecd712bd2f3496d6a7e46374171a8fa8bfa255d4"
|
||||
arm64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-linux-arm64"
|
||||
arm64.sha256 = "da23b73dea681604db62450996f46f8542ef813c9fcc7125f377ee1da6fecd3e"
|
||||
|
||||
autoupdate.strategy = "latest_github_release"
|
||||
autoupdate.asset.amd64 = "^scrutiny-web-linux-amd64$"
|
||||
autoupdate.asset.arm64 = "^scrutiny-web-linux-arm64$"
|
||||
|
||||
[resources.sources.scrutiny-collector-metrics]
|
||||
in_subdir = false
|
||||
amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-collector-metrics-linux-amd64"
|
||||
amd64.sha256 = "5dff7bc924a4003ae4e9d7c38832d87a931df74aec80b29dba929c18f2643f1b"
|
||||
arm64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-collector-metrics-linux-arm64"
|
||||
arm64.sha256 = "515bd6011723c1fd83bd861ad057437e419e589c315c53556e356bd3b850b363"
|
||||
|
||||
autoupdate.strategy = "latest_github_release"
|
||||
autoupdate.asset.amd64 = "^scrutiny-collector-metrics-linux-amd64$"
|
||||
autoupdate.asset.arm64 = "^scrutiny-collector-metrics-linux-arm64$"
|
||||
|
||||
[resources.sources.scrutiny-web-frontend]
|
||||
in_subdir = true
|
||||
url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-frontend.tar.gz"
|
||||
sha256 = "4dc50dde48494a45c88ac4c8b37fe89038b3b64d7eb51636778e4194b32e328d"
|
||||
|
||||
autoupdate.strategy = "latest_github_release"
|
||||
autoupdate.asset = "^scrutiny-web-frontend.tar.gz$"
|
||||
|
||||
[resources.system_user]
|
||||
|
||||
[resources.install_dir]
|
||||
|
|
|
|||
|
|
@ -17,17 +17,11 @@ source /usr/share/yunohost/helpers
|
|||
ynh_script_progression --message="Setting up source files..." --weight=1
|
||||
|
||||
mkdir -p "$install_dir/bin"
|
||||
if [ $YNH_ARCH == "amd64" ]
|
||||
then
|
||||
ynh_setup_source --source_id="src/scrutiny-web-linux-amd64" --dest_dir="$install_dir/bin"
|
||||
ynh_setup_source --source_id="src/scrutiny-collector-metrics-linux-amd64" --dest_dir="$install_dir/bin"
|
||||
elif [ $YNH_ARCH == "arm64" ]
|
||||
then
|
||||
ynh_setup_source --source_id="src/scrutiny-web-linux-arm64" --dest_dir="$install_dir/bin"
|
||||
ynh_setup_source --source_id="src/scrutiny-collector-metrics-linux-arm64" --dest_dir="$install_dir/bin"
|
||||
fi
|
||||
ynh_setup_source --source_id="scrutiny-web-linux" --dest_dir="$install_dir/bin"
|
||||
ynh_setup_source --source_id="scrutiny-collector-metrics" --dest_dir="$install_dir/bin"
|
||||
|
||||
mkdir -p "$install_dir/web"
|
||||
ynh_setup_source --source_id="src/scrutiny-web-frontend.tar.gz" --dest_dir="$install_dir/web"
|
||||
ynh_setup_source --source_id="scrutiny-web-frontend" --dest_dir="$install_dir/web"
|
||||
|
||||
#=================================================
|
||||
# SYSTEM CONFIGURATION
|
||||
|
|
|
|||
|
|
@ -16,8 +16,9 @@ upgrade_type=$(ynh_check_app_version_changed)
|
|||
#=================================================
|
||||
# ENSURE DOWNWARD COMPATIBILITY
|
||||
#=================================================
|
||||
#ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
|
||||
|
||||
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
|
||||
ynh_secure_remove --file="$install_dir/bin/scrutiny-web-linux-$YNH_ARCH"
|
||||
ynh_secure_remove --file="$install_dir/bin/scrutiny-collector-metrics-linux-$YNH_ARCH"
|
||||
|
||||
#=================================================
|
||||
# STOP SYSTEMD SERVICE
|
||||
|
|
@ -42,16 +43,9 @@ then
|
|||
ynh_script_progression --message="Upgrading source files..." --weight=1
|
||||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
if [ $YNH_ARCH == "amd64" ]
|
||||
then
|
||||
ynh_setup_source --source_id="src/scrutiny-web-linux-amd64" --dest_dir="$install_dir/bin"
|
||||
ynh_setup_source --source_id="src/scrutiny-collector-metrics-linux-amd64" --dest_dir="$install_dir/bin"
|
||||
elif [ $YNH_ARCH == "arm64" ]
|
||||
then
|
||||
ynh_setup_source --source_id="src/scrutiny-web-linux-arm64" --dest_dir="$install_dir/bin"
|
||||
ynh_setup_source --source_id="src/scrutiny-collector-metrics-linux-arm64" --dest_dir="$install_dir/bin"
|
||||
fi
|
||||
ynh_setup_source --source_id="src/scrutiny-web-frontend.tar.gz" --dest_dir="$install_dir/web"
|
||||
ynh_setup_source --source_id="scrutiny-web-linux" --dest_dir="$install_dir/bin"
|
||||
ynh_setup_source --source_id="scrutiny-collector-metrics" --dest_dir="$install_dir/bin"
|
||||
ynh_setup_source --source_id="scrutiny-web-frontend" --dest_dir="$install_dir/web"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Reference in a new issue