Skip to content

Commit

Permalink
Merge pull request #666 from nextcloud/ci/require-integration-summary
Browse files Browse the repository at this point in the history
ci: Add a summary for integration
  • Loading branch information
nickvergessen authored Feb 8, 2025
2 parents 1b8099f + 635671f commit 1cea55c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
25 changes: 18 additions & 7 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,13 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
submodules: recursive
repository: nextcloud/server
ref: ${{ matrix.server-versions }}

- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
cd build/integration && composer require --dev phpunit/phpunit:~9
- name: Set up integration dependencies
working-directory: build/integration
run: composer require --dev phpunit/phpunit:~9

- name: Checkout app
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down Expand Up @@ -125,3 +122,17 @@ jobs:
if: always()
run: |
cat data/nextcloud.log
summary:
permissions:
contents: none
runs-on: ubuntu-latest-low
needs: [integration]

if: always()

name: integration-summary

steps:
- name: Summary status
run: if ${{ needs.integration.result != 'success' }}; then exit 1; fi
2 changes: 1 addition & 1 deletion lib/Operation.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function checkFileAccess(IStorage $storage, string $path, bool $isDir = f
$this->nestingLevel--;

if (!empty($match)) {
$e = new \RuntimeException('Access denied for path ' . $path . ' that is ' . ($isDir ? '' : 'not ') . 'a directory and matches rules: ' . json_encode($match));
$e = new \RuntimeException('Access denied for path ' . $path . ' that is ' . ($isDir ? '' : 'not ') . 'a directory and matches rules: ' . (string)json_encode($match));
$this->logger->debug($e->getMessage(), ['exception' => $e]);
// All Checks of one operation matched: prevent access
throw new ForbiddenException('Access denied by access control', false);
Expand Down

0 comments on commit 1cea55c

Please sign in to comment.