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 PHP8 pipeline #847

Merged
merged 1 commit into from
Oct 13, 2021
Merged

Fix PHP8 pipeline #847

merged 1 commit into from
Oct 13, 2021

Conversation

rugk
Copy link
Member

@rugk rugk commented Oct 11, 2021

@rugk @elrido
Fix PHP8 pipeline
f6421c9 
As per #843 (comment)

Co-Authored-By: El RIDO <elrido@gmx.net>
@rugk rugk requested a review from elrido October 11, 2021 15:45
@rugk rugk mentioned this pull request Oct 11, 2021
Merged
@elrido elrido self-assigned this Oct 13, 2021
@elrido elrido merged commit 0fb104b into master Oct 13, 2021
@elrido elrido deleted the patch-pipeline branch October 13, 2021 17:33
@rugk
Copy link
Member Author

rugk commented Oct 13, 2021

Okay so, now failing with:

Run git merge master
git merge master
shell: /usr/bin/bash -e {0}
merge: master - not something we can merge

Did you mean this?
origin/master

Ah the suggestion makes sense, we have not git pulled master yet, so we need to merge it from origin, I'll adjust that.

rugk added a commit that referenced this pull request Oct 13, 2021
@rugk
Fix PHP refresh pipeline merge
af85292 
See #847 (comment)

Now merging the origin as master is not yet pulled.
@rugk rugk mentioned this pull request Oct 13, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elrido elrido elrido approved these changes

Assignees

@elrido elrido

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@rugk @elrido