Skip to content

Commit 1cea55c

Browse files
Merge pull request #666 from nextcloud/ci/require-integration-summary
ci: Add a summary for integration
2 parents 1b8099f + 635671f commit 1cea55c

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

.github/workflows/integration.yml

+18-7
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,13 @@ jobs:
6060
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6161
with:
6262
persist-credentials: false
63+
submodules: recursive
6364
repository: nextcloud/server
6465
ref: ${{ matrix.server-versions }}
6566

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

7471
- name: Checkout app
7572
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -125,3 +122,17 @@ jobs:
125122
if: always()
126123
run: |
127124
cat data/nextcloud.log
125+
126+
summary:
127+
permissions:
128+
contents: none
129+
runs-on: ubuntu-latest-low
130+
needs: [integration]
131+
132+
if: always()
133+
134+
name: integration-summary
135+
136+
steps:
137+
- name: Summary status
138+
run: if ${{ needs.integration.result != 'success' }}; then exit 1; fi

lib/Operation.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function checkFileAccess(IStorage $storage, string $path, bool $isDir = f
7373
$this->nestingLevel--;
7474

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

0 commit comments

Comments
 (0)