Skip to content

Commit

Permalink
Merge pull request #10716 from nextcloud/bugfix/noid/fix-CI-on-pushes
Browse files Browse the repository at this point in the history
fix(CI): Fix CI on pushes
  • Loading branch information
nickvergessen authored Oct 16, 2023
2 parents 5a09831 + d921970 commit 1228267
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 20 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/integration-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -52,7 +53,7 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

strategy:
fail-fast: false
Expand Down Expand Up @@ -164,4 +165,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.integration-mysql.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-mysql.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/integration-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -52,7 +53,7 @@ jobs:
runs-on: ubuntu-22.04

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

strategy:
fail-fast: false
Expand Down Expand Up @@ -176,4 +177,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.integration-oci.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-oci.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/integration-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -48,7 +49,7 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

strategy:
fail-fast: false
Expand Down Expand Up @@ -170,4 +171,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.integration-pgsql.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-pgsql.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/integration-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -52,7 +53,7 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

strategy:
fail-fast: false
Expand Down Expand Up @@ -155,4 +156,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.integration-sqlite.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-sqlite.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/lint-eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -47,7 +48,7 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

name: NPM lint

Expand Down Expand Up @@ -91,4 +92,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.lint.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.lint.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -47,7 +48,7 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

name: NPM build
steps:
Expand Down Expand Up @@ -100,4 +101,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.build.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.build.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -48,7 +49,7 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

strategy:
matrix:
Expand Down Expand Up @@ -173,4 +174,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/phpunit-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -48,7 +49,7 @@ jobs:
runs-on: ubuntu-22.04

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

strategy:
matrix:
Expand Down Expand Up @@ -180,4 +181,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.phpunit-oci.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-oci.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/phpunit-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -48,7 +49,7 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

strategy:
matrix:
Expand Down Expand Up @@ -170,4 +171,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi
5 changes: 3 additions & 2 deletions .github/workflows/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
steps:
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: changes
continue-on-error: true
with:
filters: |
src:
Expand All @@ -48,7 +49,7 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src == 'true'
if: needs.changes.outputs.src != 'false'

strategy:
matrix:
Expand Down Expand Up @@ -159,4 +160,4 @@ jobs:

steps:
- name: Summary status
run: if ${{ needs.changes.outputs.src == 'true' && needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi
1 change: 1 addition & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
findUnusedBaselineEntry="true"
findUnusedCode="false"
resolveFromConfigFile="true"
phpVersion="8.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd"
Expand Down

0 comments on commit 1228267

Please sign in to comment.