diff --git a/.github/workflows/block-merge-eol.yml b/.github/workflows/block-merge-eol.yml index 8c7653eac..4099cf62b 100644 --- a/.github/workflows/block-merge-eol.yml +++ b/.github/workflows/block-merge-eol.yml @@ -34,4 +34,4 @@ jobs: - 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' | grep --silent -i 'false' + 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" diff --git a/composer.lock b/composer.lock index 4a4271852..af3fd8e65 100644 --- a/composer.lock +++ b/composer.lock @@ -200,12 +200,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "5ea8c371b46db50f79ee70e92893f6b310bc6f5e" + "reference": "9fd8cd85394dc7c2c000d6bf2def918c81aab703" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/5ea8c371b46db50f79ee70e92893f6b310bc6f5e", - "reference": "5ea8c371b46db50f79ee70e92893f6b310bc6f5e", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/9fd8cd85394dc7c2c000d6bf2def918c81aab703", + "reference": "9fd8cd85394dc7c2c000d6bf2def918c81aab703", "shasum": "" }, "require": { @@ -236,7 +236,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/stable29" }, - "time": "2024-03-28T10:45:57+00:00" + "time": "2024-04-09T00:32:49+00:00" }, { "name": "nikic/php-parser",