From 70b333ffc011cf0ce430800ceadc802681683060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 1 Oct 2023 17:56:03 +0200 Subject: [PATCH 1/3] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3b452ea..3688767 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,10 +15,10 @@ code = "https://github.com/AnalogJ/scrutiny" fund = "https://paypal.me/analogj/usd10" [integration] -yunohost = ">= 11.1.6" +yunohost = ">= 11.2" architectures = ["amd64", "arm64"] multi_instance = false -ldap = "not_relevant" +ldap = "not_relevant" sso = "not_relevant" disk = "50M" ram.build = "50M" From 7cda314cae64aff44f9a7267293b2f01d1c6728c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 1 Oct 2023 15:56:08 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index e2e4f41..259c820 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ Scrutiny is a simple but focused application, with a couple of core features: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index acc6a93..3af0ec5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -45,7 +45,6 @@ Scrutiny is a simple but focused application, with a couple of core features: * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 2510744c898c6f1cdbc95f29299456a9bd2b8207 Mon Sep 17 00:00:00 2001 From: ewilly Date: Tue, 10 Oct 2023 21:13:30 +0200 Subject: [PATCH 3/3] Update workflows --- .github/workflows/update_master.yml | 26 ++++++++++++++++++++++++++ .github/workflows/updater.yml | 1 + 2 files changed, 27 insertions(+) create mode 100644 .github/workflows/update_master.yml diff --git a/.github/workflows/update_master.yml b/.github/workflows/update_master.yml new file mode 100644 index 0000000..a289a45 --- /dev/null +++ b/.github/workflows/update_master.yml @@ -0,0 +1,26 @@ +name: Create master promotion pull request +on: + # Allow to manually trigger the workflow + workflow_dispatch: + # Run it when when someone pushes to testing + push: + branches: + - testing +jobs: + masterPromotion: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + ref: master + - name: Reset promotion branch + run: | + git fetch origin testing:testing + git reset --hard testing + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5 + with: + branch: master-promotion + title: 'Upgrade master from testing' + body: | + Upgrade master from testing diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 0941a49..e24dc26 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -51,4 +51,5 @@ jobs: 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