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

Add asciidoctor to website. #77

Merged
merged 2 commits into from
May 23, 2022
Merged

Add asciidoctor to website. #77

merged 2 commits into from
May 23, 2022

Conversation

adambkaplan
Copy link
Member

@adambkaplan adambkaplan commented May 23, 2022 •
edited
Loading

  • Bump website dependencies (hugo, npm)
  • Add Asciidoctor to website.
  • Update deployment definition for Netlify.

Part of #75

@adambkaplan
bump(*):
d189c8d 
- Bump Hugo to v0.99.1.
- Update npm packages.
@adambkaplan
Add Asciidoctor
30d8738 
- Add Gemfile to install asciidoctor in website.
- Update Makefile to include a target for installing non-Hugo deps.
- Add `netlify` Make target to simplify deployments to Netlify.
@adambkaplan
Copy link
Member Author

cc @rolfedh

SaschaSchwarze0
SaschaSchwarze0 approved these changes May 23, 2022
View reviewed changes
Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 left a comment

Choose a reason for hiding this comment

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

This basically will allow usage of both Markdown or AsciiDoc, right? Would mean that we don't have to migrate things.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 23, 2022
@adambkaplan
Copy link
Member Author

/approve

This basically will allow usage of both Markdown or AsciiDoc, right? Would mean that we don't have to migrate things.

Correct - we can keep existing markdown. Though switching everything would be good for consistency.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 23, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 23, 2022
@openshift-merge-robot openshift-merge-robot merged commit a9533e7 into shipwright-io:main May 23, 2022
@rolfedh
Copy link
Contributor

rolfedh commented May 23, 2022

Yes. As I understand it, with this enhancement, with can use markdown and asciidoc content.
I would avoid having duplicate content in both file types. For example, with build.adoc and build.md, contributors might not know which file to modify.

@rolfedh
Copy link
Contributor

rolfedh commented May 23, 2022

In my tests, if you have two content files such as build.adoc and build.md, the markdown file "wins."

1 similar comment
@rolfedh
Copy link
Contributor

rolfedh commented May 23, 2022

In my tests, if you have two content files such as build.adoc and build.md, the markdown file "wins."

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SaschaSchwarze0 SaschaSchwarze0 SaschaSchwarze0 approved these changes

@HeavyWombat HeavyWombat Awaiting requested review from HeavyWombat

Assignees

@SaschaSchwarze0 SaschaSchwarze0

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@adambkaplan @rolfedh @SaschaSchwarze0 @openshift-merge-robot