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

Jump to bottom

fix: Tell composer to discard any changes we applied to vendor / contrib stuff via composer-patches. #965

Merged
merged 2 commits into from
Dec 10, 2024
Merged

fix: Tell composer to discard any changes we applied to vendor / contrib stuff via composer-patches. #965

merged 2 commits into from
Dec 10, 2024

Conversation

cafuego
Copy link
Contributor

@cafuego cafuego commented Dec 10, 2024 •
edited
Loading

Composer will re-apply the patches are update, so no need to make a mess by stashing or whatever.

This option is completely ignored when composer is in interactive mode.

Refs: RW-1128

@cafuego
fix: Tell composer to discard any changes we applied to vendor / cont…
f1984cc 
…rib stuff via composer-patches.

Composer will re-apply the patches are update, so no need to make a mess by stashing or whatever.

Refs: RW-1128
@cafuego cafuego force-pushed the cafuego/rw-1128-weird branch from 268e51b to f1984cc Compare December 10, 2024 03:21
@cafuego
Copy link
Contributor Author

cafuego commented Dec 10, 2024 •
edited
Loading

This works now because UN-OCHA/actions@04f5af7

@github-actions GitHub Actions
Copy link

Build output

Composer Validate success

PHP Lint success

Docker Build success

Environment Setup success

Site Install success

PHP Code Sniffer success

Software Versions Docker version 26.1.3, build b72abbb PHP 8.3.14 (cli) (built: Nov 20 2024 19:56:36) (NTS) Copyright (c) The PHP Group Zend Engine v4.3.14, Copyright (c) Zend Technologies with Zend OPcache v8.3.14, Copyright (c), by Zend Technologies with Xdebug v3.3.2, Copyright (c) 2002-2024, by Derick Rethans Composer version 2.8.3 2024-11-17 13:13:04
Drupal Logs
PHP Logs

Pusher: @cafuego, Action: pull_request, Workflow: Run tests

@github-actions GitHub Actions
Copy link

Coverage Report

Totals Coverage
Statements: 18.12% ( 2314 / 12768 )
Methods: 18.95% ( 137 / 723 )
Lines: 18.07% ( 2177 / 12045 )

orakili
orakili approved these changes Dec 10, 2024
View reviewed changes
Copy link
Collaborator

@orakili orakili left a comment

Choose a reason for hiding this comment

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

Thanks!

@orakili orakili merged commit e8b6ca0 into develop Dec 10, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orakili orakili orakili approved these changes

@lazysoundsystem lazysoundsystem Awaiting requested review from lazysoundsystem

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cafuego @orakili