From 26eee7ebf38f87d51dadbf90f7ae2dc97c60f6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petar=20=C5=A0panja?= Date: Fri, 3 May 2024 08:53:42 +0200 Subject: [PATCH 1/2] Revert "Always pass resolved siteaccess to avoid missing root Location ID in CLI context" This reverts commit 2f6edc9abb0342e7cefd71c14f58c8703485162f. --- bundle/Routing/GeneratorRouter.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundle/Routing/GeneratorRouter.php b/bundle/Routing/GeneratorRouter.php index 0983b6b2..fda8dcb6 100644 --- a/bundle/Routing/GeneratorRouter.php +++ b/bundle/Routing/GeneratorRouter.php @@ -157,6 +157,10 @@ private function resolveSiteaccessAndGenerate(APILocation $location, array $para $siteaccess = $this->currentSiteaccess->name; } + if ($siteaccess === $this->currentSiteaccess->name) { + return $this->generator->generate($location, $parameters, $referenceType); + } + $parameters['siteaccess'] = $siteaccess; $url = $this->generator->generate( From 59b668d8bc731feb9d17b33f39280bcbb374d06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petar=20=C5=A0panja?= Date: Fri, 3 May 2024 09:19:02 +0200 Subject: [PATCH 2/2] Fix upload to Codecov --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e6531a83..ef54ff22 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,4 +44,7 @@ jobs: - run: composer validate --strict - run: composer update --prefer-dist - run: vendor/bin/phpunit -c ${{ matrix.phpunit }} --colors=always --coverage-clover=coverage.xml - - run: bash <(curl -s https://codecov.io/bash) -F ${{ matrix.coverage }} + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }}