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..3990704 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://forge.chapril.org/${{ env.REPO }}/releases/tag/${{ env.VERSION }}) draft: false diff --git a/README.md b/README.md index 8b48b41..5ef7de0 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Zwii is a database-less (flat-file) CMS that allows you to easily create and man - Flexible -**Shipped version:** 13.0.04~ynh1 +**Shipped version:** 13.0.04~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e3a6dfa..8d44fb2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ Zwii est un CMS sans base de données (fichier plat) qui vous permet de créer e - Flexible -**Version incluse :** 13.0.04~ynh1 +**Version incluse :** 13.0.04~ynh2 ## Captures d’écran diff --git a/manifest.toml b/manifest.toml index 7e40f08..c2be01e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ZwiiCMS" description.en = "Simple, lightweight, database-free, scalable and responsive CMS" description.fr = "CMS simple, léger, sans base de données, modulable et responsive" -version = "13.0.04~ynh1" +version = "13.0.04~ynh2" maintainers = ["ewilly"] @@ -65,4 +65,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.0-mbstring,php8.0-zip,php8.0-GD,php8.0-exif,php8.0-XMLWriter,php8.0-intl" + packages = "php8.2-mbstring, php8.2-zip, php8.2-gd, php8.2-xml, php8.2-intl"