From f8a04b692ca9d5c420d45a6039f5058285e01162 Mon Sep 17 00:00:00 2001 From: ewilly Date: Thu, 28 Sep 2023 06:50:33 +0200 Subject: [PATCH 1/5] Update updater.sh Add quotes for commit_sha value --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 20198ca..281d059 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -48,7 +48,7 @@ fi #================================================= # Replace new version in _common.sh -sed -i "s/^commit_sha=.*/commit_sha=$commit_hash/" scripts/_common.sh +sed -i "s/^commit_sha=.*/commit_sha=\"$commit_hash\"/" scripts/_common.sh #================================================= # GENERIC FINALIZATION From a990e8cfcdac31f271955d23faecac3652b7d5f6 Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 1 Oct 2023 19:01:43 +0200 Subject: [PATCH 2/5] Add new workflow to update testing from master --- .github/workflows/update_testing.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/update_testing.yml diff --git a/.github/workflows/update_testing.yml b/.github/workflows/update_testing.yml new file mode 100644 index 0000000..137d40c --- /dev/null +++ b/.github/workflows/update_testing.yml @@ -0,0 +1,23 @@ +name: Create testing promotion pull request +on: + # Allow to manually trigger the workflow + workflow_dispatch: + # Run it when when someone pushes to master + push: + branches: + - master +jobs: + testingPromotion: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + ref: testing + - name: Reset promotion branch + run: | + git fetch origin master:master + git reset --hard master + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5 + with: + branch: testing-promotion From 6291a02caeb94ea1f5e315adf3215fdff6a498c3 Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 1 Oct 2023 19:03:46 +0200 Subject: [PATCH 3/5] Restore udater workflow to pull against master --- .github/workflows/updater.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 67b65ad..a1f6686 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -35,24 +35,6 @@ jobs: 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 testing 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 - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} From 402d7ea9936ab34dd147a278a3747de6600f5e4e Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 1 Oct 2023 20:41:07 +0200 Subject: [PATCH 4/5] Update update_testing.yml --- .github/workflows/update_testing.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/update_testing.yml b/.github/workflows/update_testing.yml index 137d40c..a558011 100644 --- a/.github/workflows/update_testing.yml +++ b/.github/workflows/update_testing.yml @@ -21,3 +21,6 @@ jobs: uses: peter-evans/create-pull-request@v5 with: branch: testing-promotion + title: 'Upgrade testing from master' + body: | + Upgrade testing from master From c336b44db9043e6e89d3003c74ef6fa96c82d3ab Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 2 Oct 2023 20:15:25 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 111c831..ce69157 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ SearxXNG is a free internet metasearch engine which aggregates results from more * Official user documentation: * 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 d3e74ec..0ebfff3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -33,7 +33,6 @@ SearxXNG is a free internet metasearch engine which aggregates results from more * Documentation officielle utilisateur : * 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