From 05a391e523475728ce549ff9590dd89a8bb18f18 Mon Sep 17 00:00:00 2001 From: Thetsmr Date: Sat, 2 Nov 2024 13:00:44 +0100 Subject: [PATCH] Bump version --- .github/workflows/generatemo.yml | 8 ++++---- .github/workflows/release.yml | 24 ++++++++++++++---------- .github/workflows/updatepot.yml | 6 +++--- releases.xml | 6 ++++++ setup.php | 2 +- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.github/workflows/generatemo.yml b/.github/workflows/generatemo.yml index b71ae43..14b1de7 100644 --- a/.github/workflows/generatemo.yml +++ b/.github/workflows/generatemo.yml @@ -13,12 +13,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Perl environment # You may pin to the exact commit or the version. # uses: shogo82148/actions-setup-perl@8d2e3d59a9516b785ed32169d48a4888eaa9b514 - uses: shogo82148/actions-setup-perl@v1.20.1 + uses: shogo82148/actions-setup-perl@v1 - name: msgfmt # You may pin to the exact commit or the version. # uses: whtsky/msgfmt-action@6b2181f051b002182d01a1e1f1aff216230c5a4d @@ -27,11 +27,11 @@ jobs: run: perl tools/update_mo.pl; - name: Commit changes - uses: EndBug/add-and-commit@v5.1.0 + uses: EndBug/add-and-commit@v9 with: message: "Generate mo" - name: Push changes - uses: actions-go/push@v1 + uses: actions-go/push@master diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 29ca297..43994c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ on: push: # Sequence of patterns matched against refs/tags tags: - - '*.*.*' # Push events to matching ex:20.15.10 + - '*.*.*' # Push events to matching ex:20.15.10 name: Create release with tag env: @@ -14,15 +14,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 7.4 - name: Build project # This would actually build your project, using zip for an example artifact id: build_ env: - GITHUB_NAME: ${{ github.event.repository.name }} - - - run: sudo apt-get install libxml-xpath-perl;echo $(xpath -e '/root/versions/version[num="'${GITHUB_REF/refs\/tags\//}'"]/compatibility/text()' $GITHUB_NAME.xml);echo ::set-output name=version_glpi::$(xpath -e '/root/versions/version[num="'${GITHUB_REF/refs\/tags\//}'"]/compatibility/text()' $GITHUB_NAME.xml); rm -rf $GITHUB_NAME.xml tools wiki screenshots test .git .github ISSUE_TEMPLATE.md TODO.txt $GITHUB_NAME.png;cd ..; tar jcvf glpi-$GITHUB_NAME-${GITHUB_REF/refs\/tags\//}.tar.bz2 $GITHUB_NAME;ls -al;echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//};echo ${{ steps.getxml.outputs.info }}; - # run: rm -rf $GITHUB_NAME.xml tools wiki screenshots test ISSUE_TEMPLATE.md TODO.txt $GITHUB_NAME.png; tar -zcvf glpi-$GITHUB_NAME-$GITHUB_TAG.tar.gz $GITHUB_NAME + GITHUB_NAME: ${{ github.event.repository.name }} + + + run: php -v ;sudo apt-get install libxml-xpath-perl; sudo apt-get install composer;echo $(xpath -e '/root/versions/version[num="'${GITHUB_REF/refs\/tags\//}'"]/compatibility/text()' $GITHUB_NAME.xml);echo ::set-output name=version_glpi::$(xpath -e '/root/versions/version[num="'${GITHUB_REF/refs\/tags\//}'"]/compatibility/text()' $GITHUB_NAME.xml); [[ -f composer.json ]] && composer install --no-dev; rm -rf $GITHUB_NAME.xml tools wiki screenshots test .git .github ISSUE_TEMPLATE.md TODO.txt $GITHUB_NAME.png;cd ..; tar -jcvf glpi-$GITHUB_NAME-${GITHUB_REF/refs\/tags\//}.tar.bz2 $GITHUB_NAME;ls -al;echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//};echo ${{ steps.getxml.outputs.info }}; + # run: rm -rf $GITHUB_NAME.xml tools wiki screenshots test ISSUE_TEMPLATE.md TODO.txt $GITHUB_NAME.png; tar -zcvf glpi-$GITHUB_NAME-$GITHUB_TAG.tar.bz2 $GITHUB_NAME - name: Create Release id: create_release uses: actions/create-release@v1 @@ -30,13 +34,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref }} - release_name: | - GLPI ${{ steps.build_.outputs.version_glpi }} : Version ${{ github.ref }} disponible / available + release_name: | + GLPI ${{ steps.build_.outputs.version_glpi }} : Version ${{ github.ref }} disponible / available body : Version ${{ steps.build_.outputs.tag }} released for GLPI ${{ steps.build_.outputs.version_glpi }} draft: false prerelease: true - name: Upload Release Asset - id: upload-release-asset + id: upload-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/updatepot.yml b/.github/workflows/updatepot.yml index 982c459..83e2322 100644 --- a/.github/workflows/updatepot.yml +++ b/.github/workflows/updatepot.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: install xgettext @@ -25,10 +25,10 @@ jobs: - name: Commit changes - uses: EndBug/add-and-commit@v5.1.0 + uses: EndBug/add-and-commit@v9 with: message: "Update POT" - name: Push changes - uses: actions-go/push@v1 + uses: actions-go/push@master diff --git a/releases.xml b/releases.xml index f86eaf9..9f5343d 100644 --- a/releases.xml +++ b/releases.xml @@ -31,10 +31,16 @@ The plugin allows: https://github.com/InfotelGLPI/releases/issues https://raw.githubusercontent.com/InfotelGLPI/releases/master/README.md + Xavier Caillaud Alban Lesellier Infotel + + 2.0.4 + ~10.0 + https://github.com/InfotelGLPI/releases/releases/download/2.0.4/glpi-releases-2.0.4.tar.bz2 + 2.0.3 ~10.0 diff --git a/setup.php b/setup.php index 2fe5ca6..0691fa7 100644 --- a/setup.php +++ b/setup.php @@ -27,7 +27,7 @@ -------------------------------------------------------------------------- */ -define('PLUGIN_RELEASES_VERSION', '2.0.3'); +define('PLUGIN_RELEASES_VERSION', '2.0.4'); if (!defined("PLUGIN_RELEASES_DIR")) { define("PLUGIN_RELEASES_DIR", Plugin::getPhpDir("releases"));