Skip to content

ci: Reduce required run time #47541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Aug 27, 2024
Merged

ci: Reduce required run time #47541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
364ddf0
ci: Run things we only run on 1 PHP version on the preinstalled 8.1 w…
nickvergessen Aug 27, 2024
5129e5a
ci: Don't run things normally and with coverage flag on the same conf…
nickvergessen Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/autocheckers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.3']
php-versions: ['8.1']

name: PHP checkers

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-dav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.3']
php-versions: ['8.1']
endpoint: ['old', 'new']
service: ['CalDAV', 'CardDAV']

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-litmus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.3']
php-versions: ['8.1']
endpoint: ['webdav', 'dav']

name: Litmus WebDAV ${{ matrix.endpoint }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-sqlite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- 'sharing_features'
- 'videoverification_features'

php-versions: ['8.2']
php-versions: ['8.1']
spreed-versions: ['main']

services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/object-storage-azure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.1', '8.2']
include:
- php-versions: '8.3'
coverage: true
Comment on lines -48 to 51
Copy link
Contributor

@come-nc come-nc Aug 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure whether the include will not add back 8.3?
Also, would prefer 8.1,8.3 over 8.1,8.2.

Copy link
Contributor

@come-nc come-nc Aug 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I misunderstood how include works, according to the description of the PR 🤔

Copy link
Contributor

@susnux susnux Aug 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change here will result in:

  • PHP 8.1 coverage ❌
  • PHP 8.2 coverage ❌
  • PHP 8.3 coverage ✅

Copy link
Member Author

@nickvergessen nickvergessen Aug 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure whether the include will not add back 8.3?

It will and that's exactly the fix. We ran 8.3 (and in other cases 8.2) twice. Once with the coverage flag and once without. But the only difference is whether we generate and upload the report, so we can remove the 8.3 run that is duplicated by the run that also uploads the coverage report

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/object-storage-s3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.1', '8.2']
include:
- php-versions: '8.3'
coverage: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/object-storage-swift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.1', '8.2']
include:
- php-versions: '8.3'
coverage: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up php
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
with:
php-version: '8.2'
php-version: '8.1'
extensions: ctype, curl, dom, fileinfo, gd, json, libxml, mbstring, openssl, pcntl, pdo, posix, session, simplexml, xml, xmlreader, xmlwriter, zip, zlib
coverage: none
ini-file: development
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-memcached.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.1', '8.3']
include:
- php-versions: '8.2'
coverage: ${{ github.event_name != 'pull_request' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-nodb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.1', '8.3']
include:
- php-versions: '8.2'
coverage: ${{ github.event_name != 'pull_request' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-sqlite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.2', '8.3']
include:
- php-versions: '8.1'
coverage: ${{ github.event_name != 'pull_request' }}
Expand Down