From 70e30b842397f29b3af927af2b2fc90e8fda75df Mon Sep 17 00:00:00 2001 From: Benjamin Gaussorgues Date: Thu, 6 Jun 2024 16:49:28 +0200 Subject: [PATCH] fix: fix EOL check Signed-off-by: Benjamin Gaussorgues --- workflow-templates/block-merge-eol.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow-templates/block-merge-eol.yml b/workflow-templates/block-merge-eol.yml index 2c6f35a..292494c 100644 --- a/workflow-templates/block-merge-eol.yml +++ b/workflow-templates/block-merge-eol.yml @@ -26,15 +26,15 @@ jobs: runs-on: ubuntu-latest-low steps: - - name: Download updater config - run: curl https://raw.githubusercontent.com/nextcloud/updater_server/production/config/config.php --output config.php - - name: Set server major version environment run: | # retrieve version number from branch reference server_major=$(echo "${{ github.base_ref }}" | sed -En 's/stable//p') echo "server_major=$server_major" >> $GITHUB_ENV + echo "current_month=$(date +%Y-%m)" >> $GITHUB_ENV - name: Checking if ${{ env.server_major }} is EOL run: | - php -r 'echo json_encode(require_once "config.php");' | jq --arg version "${{ env.server_major }}" '.stable[$version]["100"].eol // .beta[$version]["100"].eol // "NotEOL"' | grep -q "NotEOL" + curl -s https://raw.githubusercontent.com/nextcloud-releases/updater_server/production/config/major_versions.json \ + | jq '.["${{ env.server_major }}"]["eol"] // "9999-99" | . >= "${{ env.current_month }}"' \ + | grep -q true