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.

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

Support building HTML output #12

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Conversation

Timmmm
Copy link
Contributor

@Timmmm Timmmm commented Jan 22, 2024

Add support for building the HTML version of the specification. By default make will still only build the PDF version; make pdf or make html will build one or the other, and make all will build both. make all is run in CI.

I also deduplicated the asciidoc commands a bit, and fixed ctrl-c for the docker builds.

See #8

Makefile Outdated
# Docker command
DOCKER = docker run --rm -v $(PWD):/build -w /build $(DOCKER_IMAGE)
# Docker command. `-it` is necessary so that ctrl-c works.
DOCKER = docker run -it --rm -v $(PWD):/build -w /build $(DOCKER_IMAGE)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think -it stands for "interactive", which is probably why the CI is failing. Could you please take a look?

@andresag01
Copy link
Collaborator

@Timmmm : Thanks for the changes to the Makefile. Looks good to me, but could you take a look at the failing CI?

Add support for building the HTML version of the specification. By default `make` will still only build the PDF version; `make pdf` or `make html` will build one or the other, and `make all` will build both. `make all` is run in CI.

I also deduplicated the asciidoc commands a bit, and fixed ctrl-c for the docker builds.

See riscv#8
@andresag01
Copy link
Collaborator

@Timmmm : Thanks for the change! The CI now passes, so I will merge it.

@andresag01 andresag01 merged commit 3ad0a46 into riscv:main Jan 23, 2024
1 check passed
@Timmmm Timmmm deleted the user/timh/html branch January 24, 2024 14:41
arichardson pushed a commit to arichardson/riscv-cheri that referenced this pull request Jan 30, 2024
Update the build process to use containers and add minor improvements
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants