From 2c99b1d420c0cd9bde0e5d2a08745d9cbd482e41 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 14 Mar 2024 12:34:25 +0100 Subject: [PATCH 1/3] Update workflows --- .github/workflows/package_linter.yml | 8 ++------ .github/workflows/update_master.yml | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/package_linter.yml b/.github/workflows/package_linter.yml index 52f9538..576e4a5 100644 --- a/.github/workflows/package_linter.yml +++ b/.github/workflows/package_linter.yml @@ -4,20 +4,16 @@ on: # Allow to manually trigger the workflow workflow_dispatch: push: - branches: - - main pull_request: - schedule: - - cron: '0 8 * * *' jobs: test: 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' diff --git a/.github/workflows/update_master.yml b/.github/workflows/update_master.yml index a289a45..1c477f1 100644 --- 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' From 15847376a4892cff6d1e842ad92d169ace0174e7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 14 Mar 2024 12:38:24 +0100 Subject: [PATCH 2/3] Fix manifest --- manifest.toml | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index d36ae38..e11e418 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,7 +41,7 @@ ram.runtime = "50M" [resources] [resources.sources] - [resources.sources.scrutiny-web-linux] + [resources.sources.main] in_subdir = false amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-linux-amd64" amd64.sha256 = "42071cb77bd04a608d35e5a6ecd712bd2f3496d6a7e46374171a8fa8bfa255d4" diff --git a/scripts/install b/scripts/install index c5cda67..aedbc94 100755 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Setting up source files..." --weight=1 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" mkdir -p "$install_dir/web" diff --git a/scripts/upgrade b/scripts/upgrade index dab23a6..913d141 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,7 +41,7 @@ fi ynh_script_progression --message="Upgrading source files..." --weight=1 # 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-web-frontend" --dest_dir="$install_dir/web" From 0ef88bc34927fd2e08e74057f42ad69194801258 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 14 Mar 2024 13:55:07 +0100 Subject: [PATCH 3/3] Fix manifest --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index e11e418..de09f90 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,6 +43,7 @@ ram.runtime = "50M" [resources.sources.main] in_subdir = false + rename = "scrutiny-web-linux" 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"