mirror of
https://github.com/YunoHost-Apps/scrutiny_ynh.git
synced 2024-09-03 20:16:24 +02:00
Merge pull request #20 from YunoHost-Apps/master-promotion
Upgrade master from testing
This commit is contained in:
commit
177c03def3
5 changed files with 8 additions and 11 deletions
8
.github/workflows/package_linter.yml
vendored
8
.github/workflows/package_linter.yml
vendored
|
@ -4,20 +4,16 @@ on:
|
||||||
# Allow to manually trigger the workflow
|
# Allow to manually trigger the workflow
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
pull_request:
|
pull_request:
|
||||||
schedule:
|
|
||||||
- cron: '0 8 * * *'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.9'
|
python-version: '3.9'
|
||||||
|
|
||||||
|
|
4
.github/workflows/update_master.yml
vendored
4
.github/workflows/update_master.yml
vendored
|
@ -10,7 +10,7 @@ jobs:
|
||||||
masterPromotion:
|
masterPromotion:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
ref: master
|
ref: master
|
||||||
- name: Reset promotion branch
|
- name: Reset promotion branch
|
||||||
|
@ -18,7 +18,7 @@ jobs:
|
||||||
git fetch origin testing:testing
|
git fetch origin testing:testing
|
||||||
git reset --hard testing
|
git reset --hard testing
|
||||||
- name: Create Pull Request
|
- name: Create Pull Request
|
||||||
uses: peter-evans/create-pull-request@v5
|
uses: peter-evans/create-pull-request@v6
|
||||||
with:
|
with:
|
||||||
branch: master-promotion
|
branch: master-promotion
|
||||||
title: 'Upgrade master from testing'
|
title: 'Upgrade master from testing'
|
||||||
|
|
|
@ -41,8 +41,9 @@ ram.runtime = "50M"
|
||||||
[resources]
|
[resources]
|
||||||
[resources.sources]
|
[resources.sources]
|
||||||
|
|
||||||
[resources.sources.scrutiny-web-linux]
|
[resources.sources.main]
|
||||||
in_subdir = false
|
in_subdir = false
|
||||||
|
rename = "scrutiny-web-linux"
|
||||||
amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-linux-amd64"
|
amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-linux-amd64"
|
||||||
amd64.sha256 = "42071cb77bd04a608d35e5a6ecd712bd2f3496d6a7e46374171a8fa8bfa255d4"
|
amd64.sha256 = "42071cb77bd04a608d35e5a6ecd712bd2f3496d6a7e46374171a8fa8bfa255d4"
|
||||||
arm64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-linux-arm64"
|
arm64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-linux-arm64"
|
||||||
|
|
|
@ -17,7 +17,7 @@ source /usr/share/yunohost/helpers
|
||||||
ynh_script_progression --message="Setting up source files..." --weight=1
|
ynh_script_progression --message="Setting up source files..." --weight=1
|
||||||
|
|
||||||
mkdir -p "$install_dir/bin"
|
mkdir -p "$install_dir/bin"
|
||||||
ynh_setup_source --source_id="scrutiny-web-linux" --dest_dir="$install_dir/bin"
|
ynh_setup_source --source_id="main" --dest_dir="$install_dir/bin"
|
||||||
ynh_setup_source --source_id="scrutiny-collector-metrics-linux" --dest_dir="$install_dir/bin"
|
ynh_setup_source --source_id="scrutiny-collector-metrics-linux" --dest_dir="$install_dir/bin"
|
||||||
|
|
||||||
mkdir -p "$install_dir/web"
|
mkdir -p "$install_dir/web"
|
||||||
|
|
|
@ -41,7 +41,7 @@ fi
|
||||||
ynh_script_progression --message="Upgrading source files..." --weight=1
|
ynh_script_progression --message="Upgrading source files..." --weight=1
|
||||||
|
|
||||||
# Download, check integrity, uncompress and patch the source from app.src
|
# Download, check integrity, uncompress and patch the source from app.src
|
||||||
ynh_setup_source --source_id="scrutiny-web-linux" --dest_dir="$install_dir/bin"
|
ynh_setup_source --source_id="main" --dest_dir="$install_dir/bin"
|
||||||
ynh_setup_source --source_id="scrutiny-collector-metrics-linux" --dest_dir="$install_dir/bin"
|
ynh_setup_source --source_id="scrutiny-collector-metrics-linux" --dest_dir="$install_dir/bin"
|
||||||
ynh_setup_source --source_id="scrutiny-web-frontend" --dest_dir="$install_dir/web"
|
ynh_setup_source --source_id="scrutiny-web-frontend" --dest_dir="$install_dir/web"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue