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

merge from main to V4 #323

Merged
merged 10 commits into from
May 23, 2024
Merged

merge from main to V4 #323

merged 10 commits into from
May 23, 2024

Conversation

TimHess
Copy link
Member

@TimHess TimHess commented May 22, 2024

No description provided.

TimHess and others added 10 commits February 7, 2024 10:33
* Update local build instructions and README
* rename main site configuration files to be main-site*.json
* provide a local Docker image to run DocFX as a convenience
* Bump DocFX versions to 2.59.2

Co-authored-by: Chris Cheetham <chris@cheetham.com>
Co-authored-by: bart-vmware <104792814+bart-vmware@users.noreply.github.com>
* markdown linting, fix path to SCDF k8s installation guide
* disable search, toc tweaks
* disentangle from mainsite
* set max-width on images #163, #298

Co-authored-by: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
* drop workflow_run trigger that seems to cause extra build runs
* use docfx:2.59.4, document that main site needs to be started separate from docs site
* move to a single gha workflow & use docker args so we can build whole image stack in a PR
* "Improve this doc" links are missing #319

---------

Co-authored-by: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
@bart-vmware bart-vmware merged commit 5f521a6 into v4 May 23, 2024
1 check passed
@bart-vmware bart-vmware deleted the MainToV4 branch May 23, 2024 05:03
@bart-vmware bart-vmware mentioned this pull request May 23, 2024
bart-vmware added a commit that referenced this pull request May 28, 2024
* Fixes merge errors from #323 and removes components deleted in Steeltoe v4

* Add target branch

* include v4 in metadata

---------

Co-authored-by: Tim Hess <tim.hess@broadcom.com>
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.

3 participants