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

Move the jinja-docsite source files to the main branch #182

Merged

samccann merged 13 commits into ansible:main from oraNod:mv-jinja-docsite

Aug 23, 2023

Collaborator

oraNod commented Aug 10, 2023 •

edited by webknjaz

Loading

This PR replaces the static contents of the main branch with the source from https://github.com/ansible/jinja-docsite

This PR also includes a workflow for updating the contents of the prod branch that gets deployed to the web server via Jenkins. Also adds a Read The Docs configuration to build previews on RTD.

PR preview/demo: https://stage-docsite--182.org.readthedocs.build/en/182/.

oraNod requested a review from samccann

August 10, 2023 17:13

Collaborator

samccann commented Aug 10, 2023

Is this required to support the docs releases coming next week? I'm asking for a freeze of everything docs build releated by EOB today so we know all is stable. Maybe this (and its matching jenkins build) waits to merge after the releases? Probably a week from now.

Collaborator Author

oraNod commented Aug 10, 2023

@samccann It's fine to wait a week.

oraNod requested review from webknjaz, felixfontein, Andersson007, shanemcd, GregSutcliffe, Spredzy, anweshadas, tvo318 and a team

August 11, 2023 09:41

oraNod force-pushed the mv-jinja-docsite branch from 20c5cea to 3971d86 Compare

August 11, 2023 13:16

webknjaz reviewed

View reviewed changes

.github/workflows/build-docsite.yaml Outdated Show resolved Hide resolved

.github/workflows/build-docsite.yaml Outdated Show resolved Hide resolved

.github/workflows/build-docsite.yaml Outdated Show resolved Hide resolved

.github/workflows/build-docsite.yaml Outdated Show resolved Hide resolved

.readthedocs.yaml Outdated Show resolved Hide resolved

build.py Outdated Show resolved Hide resolved

build.py Show resolved Hide resolved

build.py Outdated Show resolved Hide resolved

build.py Outdated Show resolved Hide resolved

build.py Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

.readthedocs.yaml Show resolved Hide resolved

oraNod force-pushed the mv-jinja-docsite branch from 7824a45 to 530576c Compare

August 14, 2023 14:04

webknjaz reviewed

View reviewed changes

build.py Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

.github/workflows/reusable-build-docsite.yaml Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

.github/workflows/reusable-build-docsite.yaml Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

.github/workflows/ci.yaml Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

CONTRIBUTING.md Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

constraints.in Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

requirements.in Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

build.py Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

build.py Outdated Show resolved Hide resolved

oraNod mentioned this pull request

DaWGs (Documentation Working Group) Meeting Agenda 2023 ansible/community#678

Closed

oraNod force-pushed the mv-jinja-docsite branch from 4c6f402 to 7bdf101 Compare

August 15, 2023 11:17

webknjaz reviewed

View reviewed changes

.readthedocs.yaml Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

noxfile.py Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

noxfile.py Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

noxfile.py Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

noxfile.py Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

.readthedocs.yaml Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

.readthedocs.yaml Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

.github/workflows/reusable-build-docsite.yaml Outdated Show resolved Hide resolved

webknjaz reviewed

View reviewed changes

.readthedocs.yaml Outdated Show resolved Hide resolved

webknjaz approved these changes

View reviewed changes

Member

webknjaz left a comment

I think this is good to go in general, regardless if you'll want to apply that last suggested change.

webknjaz reviewed

View reviewed changes

.github/workflows/reusable-build-docsite.yaml Outdated Show resolved Hide resolved

Member

webknjaz commented Aug 16, 2023

@oraNod I got the maintainer to get rid of the dependency in staticjinja: staticjinja/staticjinja#186 (comment) — could you update it and re-add the strict warnings mode env var?

oraNod and others added 9 commits

August 17, 2023 12:51


          update readme and contributing

1ec718a

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>


          readthedocs config

e13c8d4

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>

mkdir rtd html

avoid unnecessary subdir


          docsite ci

272b1c8

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>

rm unused action

docsite ci

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>

Update .github/workflows/ci.yaml

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>


          do not cp http redirects etc

7212bca


          disable pip version check

86551e6


          create workflow archive

66bf374


          build.py

3275e42

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>


          project requirements

addce79

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>


          add noxfile

d478e02

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>

oraNod force-pushed the mv-jinja-docsite branch from e512839 to 54c1d56 Compare

August 17, 2023 12:23

Collaborator Author

oraNod commented Aug 17, 2023

I've rebased and squashed a bunch of commits to make it easier on additional reviewers.

oraNod and others added 3 commits

August 21, 2023 12:09


          Update .readthedocs.yaml

9e8aae8

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>


          Update .github/workflows/reusable-build-docsite.yaml

bd7a4b5

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>


          upgrade staticjinja

ca2aaa5

oraNod force-pushed the mv-jinja-docsite branch from 20d14ce to ca2aaa5 Compare

August 21, 2023 11:14

maxamillion approved these changes

View reviewed changes

maxamillion left a comment

LGTM

samccann approved these changes

View reviewed changes

Collaborator

samccann left a comment

Verified the PR build LGTM!

Thanks for all the work here!

samccann merged commit a6f7e4f into ansible:main

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

Reviewers

webknjaz webknjaz approved these changes

samccann samccann approved these changes

maxamillion maxamillion approved these changes

felixfontein Awaiting requested review from felixfontein

Andersson007 Awaiting requested review from Andersson007

shanemcd Awaiting requested review from shanemcd

GregSutcliffe Awaiting requested review from GregSutcliffe

Spredzy Awaiting requested review from Spredzy

anweshadas Awaiting requested review from anweshadas

tvo318 Awaiting requested review from tvo318

Labels

None yet