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

Dual-license error-stack and misc drive-by updates #1172

Merged
merged 46 commits into from
Oct 7, 2022
Merged

Dual-license error-stack and misc drive-by updates #1172

merged 46 commits into from
Oct 7, 2022

Conversation

vilkinsons
Copy link
Member

@vilkinsons vilkinsons commented Oct 6, 2022 •
edited
Loading

🌟 What is the purpose of this PR?

This PR combines multiple miscellaneous changes.

  • Adds mention of our CLA Assistant bot/process to the top-level CONTRIBUTING file.
  • Adds an additional license option to our error-stack Rust crate (introducing Apache 2.0 as an option, complementing the existing MIT license).
  • Improves license markdown formatting.
  • Improves the structure of the error-stack README and adds additional information.
  • Adds additional information to our open-source strategy blog post.
  • Updates certain README text ahead of planned monorepo structure improvements.
  • Updates the filenames of our markdown blog posts to enable better cross-env chronological sorting.
  • Updates the titles of various blog post authors to reflect their positions at HASH.
  • Improves title of 'blocks' GitHub Issue bug report form
  • Adds deer crate GitHub Issue bug report form ahead of Introduce deer crate at v0.0.0 #1163 merging

@github-actions github-actions bot added area/libs > error-stack Affects the `error-stack` crate (library) area/infra Relates to version control, CI, CD or IaC (area) labels Oct 6, 2022
@vilkinsons
Rename 1_block-design.mdx to 001_block-design.mdx
f760955 
Testing to see if this breaks the ordering...
vilkinsons and others added 3 commits October 7, 2022 14:19
@vilkinsons @TimDiekmann
Update .github/ISSUE_TEMPLATE/bug-report-deer.yml
a27bcb2 
Co-authored-by: Tim Diekmann <21277928+TimDiekmann@users.noreply.github.com>
@vilkinsons @TimDiekmann
Update .github/ISSUE_TEMPLATE/bug-report-deer.yml
e069b68 
Co-authored-by: Tim Diekmann <21277928+TimDiekmann@users.noreply.github.com>
@vilkinsons
Update sites/hashdev/src/_pages/blog/0002_open-source.mdx
550b885
@vilkinsons @TimDiekmann
Update .github/ISSUE_TEMPLATE/bug-report-deer.yml
234f192 
Co-authored-by: Tim Diekmann <21277928+TimDiekmann@users.noreply.github.com>
@vilkinsons
Copy link
Member Author

vilkinsons commented Oct 7, 2022 •
edited
Loading

Adds deer crate GitHub Issue bug report form ahead of #1163 merging

Does this PR block #1163?

We're fine with them merging in either order! @indietyp No. 😄

TimDiekmann
TimDiekmann approved these changes Oct 7, 2022
View reviewed changes
Copy link
Member

@TimDiekmann TimDiekmann left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I updated the README.mds in sites/hashdev/public/blog to point to the correct folders in 674e274

Changes are looking good, but I noticed, that a readme for the 5. and 9. blog post are missing.

@TimDiekmann TimDiekmann dismissed their stale review October 7, 2022 14:32

Applied suggestion

@vilkinsons vilkinsons removed the request for review from indietyp October 7, 2022 15:20
@vilkinsons vilkinsons enabled auto-merge (squash) October 7, 2022 15:29
@vilkinsons vilkinsons merged commit d661435 into main Oct 7, 2022
@vilkinsons vilkinsons deleted the dw/mixed-updates branch October 7, 2022 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@indietyp indietyp indietyp left review comments

@TimDiekmann TimDiekmann TimDiekmann approved these changes

Assignees
No one assigned
Labels
area/infra Relates to version control, CI, CD or IaC (area) area/libs > error-stack Affects the `error-stack` crate (library)
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vilkinsons @TimDiekmann @indietyp