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 ecs GitHub repo link source branch #1393

Merged
merged 25 commits into from
May 6, 2021
Merged

Fix ecs GitHub repo link source branch #1393

merged 25 commits into from
May 6, 2021

Conversation

djptek
Copy link
Contributor

@djptek djptek commented May 5, 2021

  • Have you signed the contributor license agreement? Y
  • Have you followed the contributor guidelines? Y
  • For proposing substantial changes or additions to the schema, have you reviewed the RFC process? n/a
  • If submitting code/script changes, have you verified all tests pass locally using make test? Y
  • If submitting schema/fields updates, have you generated new artifacts by running make and committed those changes? Y
  • Is your pull request against master? Unless there is a good reason otherwise, we prefer pull requests against master and will backport as needed. Y
  • Have you added an entry to the CHANGELOG.next.md? Y

Continuation of prematurely merged #1381

djptek and others added 17 commits April 23, 2021 16:06
introduce source_branch
5ae5dea
version 2.0.0-dev
9a57d86
add template for index.asciidoc
d440f6d
update Changelog WIP
ddca332
update Changelog 1381
9415836
catchup changelog
ed12d38
catchup to master
463d2b4
Merge branch 'master' into fix_ecs_github_repo_link_source_branch
643fc79
@djptek
Merge branch 'master' into fix_ecs_github_repo_link_source_branch
8a97f4c
run through ci with v1.10.0
6c86a91
Merge branch 'master' into fix_ecs_github_repo_link_source_branch
f519406
Merge branch 'fix_ecs_github_repo_link_source_branch' of https://gith…
992886c 
…ub.com/djptek/ecs into fix_ecs_github_repo_link_source_branch
testing v1.11.0 source_branch keeps regressing to master
7413a6b
restore version
8309d57
Merge branch 'master' into fix_ecs_github_repo_link_source_branch
0543f0f
fixed regression around ecs_generated_version
f59dbd1
merge and fix gitignore
b21785d
@djptek djptek marked this pull request as draft May 5, 2021 13:25
@djptek
Copy link
Contributor Author

djptek commented May 5, 2021

Converting to draft as build preview currently showing 404 & I want to check that

@djptek
Copy link
Contributor Author

djptek commented May 5, 2021

@elasticmachine run elasticsearch-ci/docs

@djptek djptek mentioned this pull request May 5, 2021
Closed
@djptek djptek marked this pull request as ready for review May 5, 2021 16:01
@djptek
Copy link
Contributor Author

djptek commented May 5, 2021

Thanks @ebeahan for spotting the missing line! I also opened a pre-emptive backport PR here: #1394 to validate that it really does work vs non "-dev" suffix versions

@djptek djptek requested review from ebeahan and kgeller May 5, 2021 16:08
@djptek
Copy link
Contributor Author

djptek commented May 5, 2021

see:

2.0.0-dev vs Master
https://ecs_1393.docs-preview.app.elstc.co/guide/en/ecs/master/ecs-reference.html
https://ecs_1393.docs-preview.app.elstc.co/guide/en/ecs/master/ecs-artifacts.html

vs

1.10.0-dev vs 1.10.0
https://ecs_1394.docs-preview.app.elstc.co/guide/en/ecs/1.10/ecs-reference.html
https://ecs_1394.docs-preview.app.elstc.co/guide/en/ecs/1.10/ecs-artifacts.html

kgeller
kgeller approved these changes May 5, 2021
View reviewed changes
Copy link
Contributor

@kgeller kgeller left a comment

Choose a reason for hiding this comment

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

lgtm

ebeahan
ebeahan reviewed May 6, 2021
View reviewed changes
@djptek
Copy link
Contributor Author

djptek commented May 6, 2021

@elasticmachine run elasticsearch-ci/docs

@djptek
Copy link
Contributor Author

djptek commented May 6, 2021

Applied @beahan 's suggestions and triple checked restoration of the period. Jenkins appears to ignore on the "master" docs but apply on all other branches and local make applies correctly so merging

@djptek djptek merged commit 14d8251 into elastic:master May 6, 2021
@djptek djptek mentioned this pull request May 6, 2021
Merged
djptek added a commit that referenced this pull request May 6, 2021
@djptek
Fix ecs GitHub repo link source branch (#1393) (#1397)
8e928af 
* introduce source_branch

# Conflicts:
#	scripts/generator.py
@djptek djptek mentioned this pull request May 6, 2021
Closed
@djptek djptek mentioned this pull request May 13, 2021
Merged
djptek added a commit that referenced this pull request May 13, 2021
@djptek
[1.10] Fix ecs GitHub repo link source branch (#1393) (#1414)
f2e013b 
* backport
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ebeahan ebeahan ebeahan left review comments

@kgeller kgeller kgeller approved these changes

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
@djptek @ebeahan @kgeller