Skip to content
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

Drop composer.lock from the committed files list #1106

Closed
wants to merge 5 commits into from
Closed

Drop composer.lock from the committed files list #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5a9780
Drop `composer.lock` from the committed files list
Slamdunk Feb 19, 2025
24172f3
Fix coding standard issues
Slamdunk Feb 19, 2025
454cd2c
`composer.lock` isn't committed anymore
Slamdunk Feb 19, 2025
6d4cbbf
Drop `composer.lock` from Makefile too
Slamdunk Feb 19, 2025
eb3b765
`locked` meant `highest` on the lowest PHP version supported
Slamdunk Feb 19, 2025
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
1 change: 0 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
/CONTRIBUTING.md export-ignore
/*.dist export-ignore
/phpbench.json export-ignore
/composer.lock export-ignore
/README.md export-ignore
/Makefile export-ignore
/.roave-backward-compatibility-check.json export-ignore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
dependencies:
- "locked"
- "highest"
php-version:
- "8.3"
operating-system:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
dependencies:
- "locked"
- "highest"
php-version:
- "8.3"
operating-system:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mutation-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
dependencies:
- "locked"
- "highest"
php-version:
- "8.3"
operating-system:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
dependencies:
- "lowest"
- "highest"
- "locked"
php-version:
- "8.3"
- "8.4"
Expand Down Expand Up @@ -50,7 +49,7 @@ jobs:
strategy:
matrix:
dependencies:
- "locked"
- "highest"
php-version:
- "8.5"
operating-system:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
dependencies:
- "locked"
- "highest"
php-version:
- "8.3"
operating-system:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ phpcs.xml
/.phpunit.result.cache
/.phpunit.cache
/build
/composer.lock
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ all: install phpcbf phpcs phpstan phpunit infection phpbench
.PHONY: install
install: vendor/composer/installed.json

vendor/composer/installed.json: composer.json composer.lock
@composer install $(INSTALL_FLAGS)
@touch -c composer.json composer.lock vendor/composer/installed.json
vendor/composer/installed.json: composer.json
@composer update $(INSTALL_FLAGS)
@touch -c composer.json vendor/composer/installed.json

.PHONY: phpunit
phpunit:
Expand Down
Loading