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

Moved patch files to repo #2985

Merged
merged 2 commits into from
Jan 24, 2023
Merged

Moved patch files to repo #2985

merged 2 commits into from
Jan 24, 2023

Conversation

sreichel
Copy link
Contributor

Description (*)

#2960 (comment)

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)
  • Add yourself to contributors list

@github-actions github-actions bot added the composer Relates to composer.json label Jan 20, 2023
elidrissidev
elidrissidev previously approved these changes Jan 21, 2023
View reviewed changes
ADDISON74
ADDISON74 previously approved these changes Jan 21, 2023
View reviewed changes
@justinbeaty
Copy link
Contributor

Note: there's still some discussion on if a separate repo is the best solution starting with this comment.

@fballiano
Copy link
Contributor

It's ok with me but referencing the commit hash could be done also from the external repo, just to be sure that the patches are immutable in case of modifications (that will almost never happen but still...)

@elidrissidev elidrissidev dismissed stale reviews from ADDISON74 and themself via c4f940c January 24, 2023 09:06
elidrissidev
elidrissidev approved these changes Jan 24, 2023
View reviewed changes
Copy link
Member

@elidrissidev elidrissidev left a comment

Choose a reason for hiding this comment

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

Should be good now

@fballiano fballiano merged commit 663136a into OpenMage:1.9.4.x Jan 24, 2023
fballiano pushed a commit that referenced this pull request Jan 24, 2023
@fballiano
Moved ZF1 patch files to a separate repository (#2985)
09e47b8
@fballiano
Copy link
Contributor

merged and cherrypicked to v20

@elidrissidev
Copy link
Member

Ops composer.lock was not updated

@fballiano
Copy link
Contributor

we'll have to do it in a new PR

fballiano added a commit that referenced this pull request Jan 24, 2023
@fballiano
updated composer.lock after #2985
a577c93
fballiano added a commit that referenced this pull request Jan 24, 2023
@fballiano
updated composer.lock after #2985
e8fc4d4
@fballiano
Copy link
Contributor

fballiano commented Jan 24, 2023 •
edited
Loading

I updated the composer lock directly on the branches with a577c93

@sreichel sreichel deleted the patches branch January 25, 2023 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fballiano fballiano fballiano approved these changes

@elidrissidev elidrissidev elidrissidev approved these changes

@ADDISON74 ADDISON74 ADDISON74 left review comments

Assignees
No one assigned
Labels
composer Relates to composer.json
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@sreichel @justinbeaty @fballiano @elidrissidev @ADDISON74