Skip to content

update branch to main#36

Merged
v1v merged 6 commits intoelastic:mainfrom
v1v:feature/update-main
Dec 17, 2021
Merged

update branch to main#36
v1v merged 6 commits intoelastic:mainfrom
v1v:feature/update-main

Conversation

@v1v
Copy link
Copy Markdown
Member

@v1v v1v commented Dec 16, 2021

No description provided.

@v1v v1v requested review from a team and bmorelli25 December 16, 2021 17:38
@ghost
Copy link
Copy Markdown

ghost commented Dec 16, 2021 •
edited by ghost
Loading

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-17T09:22:56.193+0000

  • Duration: 11 min 4 sec

  • Commit: 818d579

Test stats 🧪

Test Results
Failed 0
Passed 6
Skipped 0
Total 6

Steps errors 5

Expand to view the steps failures

Run tests
  • Took 0 min 1 sec . View more details here
  • Description: VERSION=7.2-alpine composer test
Run tests
  • Took 0 min 2 sec . View more details here
  • Description: VERSION=7.3-alpine composer test
Run tests
  • Took 0 min 1 sec . View more details here
  • Description: VERSION=7.4-alpine composer test
Run tests
  • Took 0 min 1 sec . View more details here
  • Description: VERSION=8.0-alpine composer test
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: hudson.AbortException: script returned exit code 2

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@v1v v1v mentioned this pull request Dec 16, 2021
Merged
cachedout
cachedout reviewed Dec 16, 2021
View reviewed changes
.ci/jobs/defaults.yml
timeout: '15'
use-author: true
wipe-workspace: 'True'
periodic-folder-trigger: 1d
Copy link
Copy Markdown

@cachedout cachedout Dec 16, 2021

Choose a reason for hiding this comment

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

Seems unrelated to this change. Move to another PR?

README.md Outdated
This software is licensed under the [Apache 2 license](https://github.com/elastic/ecs-logging-php/blob/master/LICENSE).
[![Build Status](https://apm-ci.elastic.co/buildStatus/icon?job=apm-agent-php%2Fecs-logging-php-mbp%2Fmain)](https://apm-ci.elastic.co/job/apm-agent-php/job/ecs-logging-php-mbp/job/main/)

# ECS Logging for PHP
Copy link
Copy Markdown

@cachedout cachedout Dec 16, 2021

Choose a reason for hiding this comment

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

How did all this change? Did a formatter kick in?

Copy link
Copy Markdown
Contributor

@pimjansen pimjansen Dec 16, 2021

Choose a reason for hiding this comment

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

Isnt it a line ending change? CRLF / LF

Copy link
Copy Markdown
Member Author

@v1v v1v Dec 16, 2021

Choose a reason for hiding this comment

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

I was not expecting this, so I'll see if I can revert it

v1v
v1v commented Dec 16, 2021
View reviewed changes
v1v
v1v commented Dec 16, 2021
View reviewed changes
v1v and others added 4 commits December 16, 2021 21:11
@v1v
revert unrelated jjbb changes
90f2496
@v1v
Replace only master
b3f1323
@v1v
Merge branch 'feature/update-main' of github.com:v1v/ecs-logging-php …
f2ef063 
…into feature/update-main

* 'feature/update-main' of github.com:v1v/ecs-logging-php:
  revert unrelated jjbb changes
  Update .ci/jobs/defaults.yml
@v1v
Replace only master from main
818d579
cachedout
cachedout approved these changes Dec 17, 2021
View reviewed changes
Copy link
Copy Markdown

@cachedout cachedout left a comment

Choose a reason for hiding this comment

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

Thanks for cleaning this one up. :)

@v1v v1v merged commit 15a364a into elastic:main Dec 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cachedout cachedout cachedout approved these changes

@bmorelli25 bmorelli25 Awaiting requested review from bmorelli25

+1 more reviewer

@pimjansen pimjansen pimjansen left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@v1v @cachedout @pimjansen