Conversation
* Add new staging docs site deploy action and workflow * Change to PR branch for testing * Change to PR branch for testing, take 2 * Add quarto render steps to staging and prod workflows * Minor wording fix * Minor wording tweaks * Change to prod site for testing * Fix path issue in aws command, revert to correct branches * Remove some GitHub variables * Switch staging deploy to new AWS access keys * Switch to PR branch for testing * Fix duplicate names * Update bucket region info * Formatting * Update Cloudfront info for staging and debug paths * More path debugging * More path debugging * Fix deploy paths & remove debugging info * Switch back to staging branch * Change to PR branch for testing * Change back to staging branch * Change to PR branch and docs-demo bucket for testing * Change back to prod branch and prod bucket
Merge main into staging
* Filter activity setup * Simplified some inline links * Draft of edited unless-format footnotes * Edited unless-format for Model Activity & Document Overview * Edited unless-format for Submit for approval * Edited unless-format for Assess compliance * Edited unless-format for Work with model findings * Fixed broken links in single-source * Edits based on what is available locally * Final tweaks * Added single-source template * Update README.md * Update README.md * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Bolded compliance assessments --------- Co-authored-by: Nik Richers <[email protected]>
* Draft of new release notes * Edited validation guidelines release * Draft -need to edit bug fixes * Why did it not commit all files?? * Final tweaks to body * Summary added * Grammar?? * Removed extra documentation as requested * Removed bug fixes * My brain is not on today, typo
Merge main into staging
Merge main into staging
* Can we make it only run once let's see * Updated to review_requested
Merge main into staging
* Modify make python-docs to store files in site folder * Add python-docs to source
Merge main into staging
* Remove echoing to log file * Add quarto check to workflow * Add TinyTex install * Experiment by removing tabset * Remove TinyTex install * Re-add tabset, try individual file embeds * Try changing wildcard embed * Try different wildcard embed * Undo workflow changes
Merge main into staging
Merge main into staging
|
|
Contributor
|
A PR preview is available: Preview URL |
Collaborator
This might be explained by branch divergence, as we are merging branches with histories that will have some differences. The way I understand this, this state is not a major concern as it does not affect the outcome of the merge. That said, we can monitor future PRs to see if the list of commits continues to grow. |
nrichers
approved these changes
Sep 9, 2024
Collaborator
nrichers
left a comment
There was a problem hiding this comment.
LGTM. Note merging into prod does not generally require approval though it's probably a good idea to scrutinize PRs initially until we become more comfortable with the process.
nrichers
added a commit
that referenced
this pull request
Sep 20, 2024
* [create-pull-request] automated change * Update rendered site * Delete site/_site directory in staging (#326) * Delete site/_site directory in prod (#328) * Merging staging into prod (#331) * Add staging docs site deploy and update prod deploy (#309) * Add new staging docs site deploy action and workflow * Change to PR branch for testing * Change to PR branch for testing, take 2 * Add quarto render steps to staging and prod workflows * Minor wording fix * Minor wording tweaks * Change to prod site for testing * Fix path issue in aws command, revert to correct branches * Remove some GitHub variables * Switch staging deploy to new AWS access keys * Switch to PR branch for testing * Fix duplicate names * Update bucket region info * Formatting * Update Cloudfront info for staging and debug paths * More path debugging * More path debugging * Fix deploy paths & remove debugging info * Switch back to staging branch * Change to PR branch for testing * Change back to staging branch * Change to PR branch and docs-demo bucket for testing * Change back to prod branch and prod bucket * Delete site/_site directory in staging (#326) --------- Co-authored-by: Nik Richers <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Merge staging into prod (#338) * Add staging docs site deploy and update prod deploy (#309) * Add new staging docs site deploy action and workflow * Change to PR branch for testing * Change to PR branch for testing, take 2 * Add quarto render steps to staging and prod workflows * Minor wording fix * Minor wording tweaks * Change to prod site for testing * Fix path issue in aws command, revert to correct branches * Remove some GitHub variables * Switch staging deploy to new AWS access keys * Switch to PR branch for testing * Fix duplicate names * Update bucket region info * Formatting * Update Cloudfront info for staging and debug paths * More path debugging * More path debugging * Fix deploy paths & remove debugging info * Switch back to staging branch * Change to PR branch for testing * Change back to staging branch * Change to PR branch and docs-demo bucket for testing * Change back to prod branch and prod bucket * Delete site/_site directory in staging (#326) * Revamped Model Activity docs (#315) * Filter activity setup * Simplified some inline links * Draft of edited unless-format footnotes * Edited unless-format for Model Activity & Document Overview * Edited unless-format for Submit for approval * Edited unless-format for Assess compliance * Edited unless-format for Work with model findings * Fixed broken links in single-source * Edits based on what is available locally * Final tweaks * Added single-source template * Update README.md * Update README.md * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Bolded compliance assessments --------- Co-authored-by: Nik Richers <[email protected]> * Release notes for Sept 9 2024 (#329) * Draft of new release notes * Edited validation guidelines release * Draft -need to edit bug fixes * Why did it not commit all files?? * Final tweaks to body * Summary added * Grammar?? * Removed extra documentation as requested * Removed bug fixes * My brain is not on today, typo * Only running the PR previews bot when a PR is ready for review (#330) * Can we make it only run once let's see * Updated to review_requested * Modify make python-docs to support rendering online (#336) * Modify make python-docs to store files in site folder * Add python-docs to source --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Beck <[email protected]> * Delete .github/workflows/render-site.yaml (#344) * Pushing changes from `staging` into `prod` (#347) * Add staging docs site deploy and update prod deploy (#309) * Add new staging docs site deploy action and workflow * Change to PR branch for testing * Change to PR branch for testing, take 2 * Add quarto render steps to staging and prod workflows * Minor wording fix * Minor wording tweaks * Change to prod site for testing * Fix path issue in aws command, revert to correct branches * Remove some GitHub variables * Switch staging deploy to new AWS access keys * Switch to PR branch for testing * Fix duplicate names * Update bucket region info * Formatting * Update Cloudfront info for staging and debug paths * More path debugging * More path debugging * Fix deploy paths & remove debugging info * Switch back to staging branch * Change to PR branch for testing * Change back to staging branch * Change to PR branch and docs-demo bucket for testing * Change back to prod branch and prod bucket * Delete site/_site directory in staging (#326) * Revamped Model Activity docs (#315) * Filter activity setup * Simplified some inline links * Draft of edited unless-format footnotes * Edited unless-format for Model Activity & Document Overview * Edited unless-format for Submit for approval * Edited unless-format for Assess compliance * Edited unless-format for Work with model findings * Fixed broken links in single-source * Edits based on what is available locally * Final tweaks * Added single-source template * Update README.md * Update README.md * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Bolded compliance assessments --------- Co-authored-by: Nik Richers <[email protected]> * Release notes for Sept 9 2024 (#329) * Draft of new release notes * Edited validation guidelines release * Draft -need to edit bug fixes * Why did it not commit all files?? * Final tweaks to body * Summary added * Grammar?? * Removed extra documentation as requested * Removed bug fixes * My brain is not on today, typo * Only running the PR previews bot when a PR is ready for review (#330) * Can we make it only run once let's see * Updated to review_requested * Modify make python-docs to support rendering online (#336) * Modify make python-docs to store files in site folder * Add python-docs to source * Delete .github/workflows/render-site.yaml (#344) * Investigate listing page issue (#334) * Remove echoing to log file * Add quarto check to workflow * Add TinyTex install * Experiment by removing tabset * Remove TinyTex install * Re-add tabset, try individual file embeds * Try changing wildcard embed * Try different wildcard embed * Undo workflow changes * Fix Heap embeds for docs sites — `main` branch (#339) * Remove production Heap embed * Re-add Heap file for development --------- Co-authored-by: Nik Richers <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix heap embeds for docs sites — staging branch (#340) * Merge staging into prod fix conflicts (#365) * Add staging docs site deploy and update prod deploy (#309) * Add new staging docs site deploy action and workflow * Change to PR branch for testing * Change to PR branch for testing, take 2 * Add quarto render steps to staging and prod workflows * Minor wording fix * Minor wording tweaks * Change to prod site for testing * Fix path issue in aws command, revert to correct branches * Remove some GitHub variables * Switch staging deploy to new AWS access keys * Switch to PR branch for testing * Fix duplicate names * Update bucket region info * Formatting * Update Cloudfront info for staging and debug paths * More path debugging * More path debugging * Fix deploy paths & remove debugging info * Switch back to staging branch * Change to PR branch for testing * Change back to staging branch * Change to PR branch and docs-demo bucket for testing * Change back to prod branch and prod bucket * Delete site/_site directory in staging (#326) * Revamped Model Activity docs (#315) * Filter activity setup * Simplified some inline links * Draft of edited unless-format footnotes * Edited unless-format for Model Activity & Document Overview * Edited unless-format for Submit for approval * Edited unless-format for Assess compliance * Edited unless-format for Work with model findings * Fixed broken links in single-source * Edits based on what is available locally * Final tweaks * Added single-source template * Update README.md * Update README.md * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Bolded compliance assessments --------- Co-authored-by: Nik Richers <[email protected]> * Release notes for Sept 9 2024 (#329) * Draft of new release notes * Edited validation guidelines release * Draft -need to edit bug fixes * Why did it not commit all files?? * Final tweaks to body * Summary added * Grammar?? * Removed extra documentation as requested * Removed bug fixes * My brain is not on today, typo * Only running the PR previews bot when a PR is ready for review (#330) * Can we make it only run once let's see * Updated to review_requested * Modify make python-docs to support rendering online (#336) * Modify make python-docs to store files in site folder * Add python-docs to source * Delete .github/workflows/render-site.yaml (#344) * Investigate listing page issue (#334) * Remove echoing to log file * Add quarto check to workflow * Add TinyTex install * Experiment by removing tabset * Remove TinyTex install * Re-add tabset, try individual file embeds * Try changing wildcard embed * Try different wildcard embed * Undo workflow changes * Fix Heap embeds for docs sites — `main` branch (#339) * Remove production Heap embed * Re-add Heap file for development * Fix heap embeds for docs sites — staging branch (#340) * Doc: Archive and delete inventory models (#351) * Delete model findings draft * Tweaks to project > model * Draft for Archive & delete models * Oops carried changes from a working branch instead of main, reverting * Tweaking wording * Indecisive about wording today * Added archive & delete to sidebar * Final tweaks based on what's on staging * Typo * Tired, tweaks * Update site/guide/model-inventory/archive-delete-models.qmd Co-authored-by: Nik Richers <[email protected]> --------- Co-authored-by: Nik Richers <[email protected]> * Revamped model findings docs for attachments (#352) * Draft * More fiddling * Fiddling * Link tweaks * More project tweaks * Editing based on demo * Created new Working with model findings landing * 1st pass of broken links * 2nd pass of broken links * Summary drafts * Tweaks * More tweaks * Adjustments for prod * Adding deletion after discussion * Images * Removed commented out indications for required fields * New all model findings image * Pulling in latest changes from PR184 (#350) * Pulled in latest test descriptions Sept 03 2024 * Example retrieval for process docs * Delete finding docs update (#355) * Delete finding update, also python docs from main? * Changed to Add and manage model findings * Moved activity to model inventory & adjusted pages (#358) * Moved activity to model inventory & adjusted pages * Missed a link apparently thanks workflow * Missed an external link * Training updates related to creating videos (#227) * Update training title slides * Move training into navbar * Fix glossary entry * Rename training overview file * Fix links to old training filename * Minor styling tweaks before recording videos * Add instruction to verify workflow * Clean up * Update title * Comment out banner * Re-added announcement, but for our technical brief * lil divider for funsies --------- Co-authored-by: Beck <[email protected]> * Clarified style guidelines for links & training (#363) * Inline link & training draft * Edits to footnotes * Example images * Footnotes * Tweaks * Typos * Update site/about/contributing/style-guide/conventions.qmd Co-authored-by: Nik Richers <[email protected]> * Edited the other front matter ref --------- Co-authored-by: Nik Richers <[email protected]> --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Beck <[email protected]> * Publishing changes from PR #340 onwards (#362) * Add staging docs site deploy and update prod deploy (#309) * Add new staging docs site deploy action and workflow * Change to PR branch for testing * Change to PR branch for testing, take 2 * Add quarto render steps to staging and prod workflows * Minor wording fix * Minor wording tweaks * Change to prod site for testing * Fix path issue in aws command, revert to correct branches * Remove some GitHub variables * Switch staging deploy to new AWS access keys * Switch to PR branch for testing * Fix duplicate names * Update bucket region info * Formatting * Update Cloudfront info for staging and debug paths * More path debugging * More path debugging * Fix deploy paths & remove debugging info * Switch back to staging branch * Change to PR branch for testing * Change back to staging branch * Change to PR branch and docs-demo bucket for testing * Change back to prod branch and prod bucket * Delete site/_site directory in staging (#326) * Revamped Model Activity docs (#315) * Filter activity setup * Simplified some inline links * Draft of edited unless-format footnotes * Edited unless-format for Model Activity & Document Overview * Edited unless-format for Submit for approval * Edited unless-format for Assess compliance * Edited unless-format for Work with model findings * Fixed broken links in single-source * Edits based on what is available locally * Final tweaks * Added single-source template * Update README.md * Update README.md * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Update site/guide/configuration/manage-your-profile.qmd Co-authored-by: Nik Richers <[email protected]> * Bolded compliance assessments --------- Co-authored-by: Nik Richers <[email protected]> * Release notes for Sept 9 2024 (#329) * Draft of new release notes * Edited validation guidelines release * Draft -need to edit bug fixes * Why did it not commit all files?? * Final tweaks to body * Summary added * Grammar?? * Removed extra documentation as requested * Removed bug fixes * My brain is not on today, typo * Only running the PR previews bot when a PR is ready for review (#330) * Can we make it only run once let's see * Updated to review_requested * Modify make python-docs to support rendering online (#336) * Modify make python-docs to store files in site folder * Add python-docs to source * Delete .github/workflows/render-site.yaml (#344) * Investigate listing page issue (#334) * Remove echoing to log file * Add quarto check to workflow * Add TinyTex install * Experiment by removing tabset * Remove TinyTex install * Re-add tabset, try individual file embeds * Try changing wildcard embed * Try different wildcard embed * Undo workflow changes * Fix Heap embeds for docs sites — `main` branch (#339) * Remove production Heap embed * Re-add Heap file for development * Fix heap embeds for docs sites — staging branch (#340) * Doc: Archive and delete inventory models (#351) * Delete model findings draft * Tweaks to project > model * Draft for Archive & delete models * Oops carried changes from a working branch instead of main, reverting * Tweaking wording * Indecisive about wording today * Added archive & delete to sidebar * Final tweaks based on what's on staging * Typo * Tired, tweaks * Update site/guide/model-inventory/archive-delete-models.qmd Co-authored-by: Nik Richers <[email protected]> --------- Co-authored-by: Nik Richers <[email protected]> * Revamped model findings docs for attachments (#352) * Draft * More fiddling * Fiddling * Link tweaks * More project tweaks * Editing based on demo * Created new Working with model findings landing * 1st pass of broken links * 2nd pass of broken links * Summary drafts * Tweaks * More tweaks * Adjustments for prod * Adding deletion after discussion * Images * Removed commented out indications for required fields * New all model findings image * Pulling in latest changes from PR184 (#350) * Pulled in latest test descriptions Sept 03 2024 * Example retrieval for process docs * Delete finding docs update (#355) * Delete finding update, also python docs from main? * Changed to Add and manage model findings * Moved activity to model inventory & adjusted pages (#358) * Moved activity to model inventory & adjusted pages * Missed a link apparently thanks workflow * Missed an external link * Training updates related to creating videos (#227) * Update training title slides * Move training into navbar * Fix glossary entry * Rename training overview file * Fix links to old training filename * Minor styling tweaks before recording videos * Add instruction to verify workflow * Clean up * Update title * Comment out banner * Re-added announcement, but for our technical brief * lil divider for funsies --------- Co-authored-by: Beck <[email protected]> * Clarified style guidelines for links & training (#363) * Inline link & training draft * Edits to footnotes * Example images * Footnotes * Tweaks * Typos * Update site/about/contributing/style-guide/conventions.qmd Co-authored-by: Nik Richers <[email protected]> * Edited the other front matter ref --------- Co-authored-by: Nik Richers <[email protected]> --------- Co-authored-by: Nik Richers <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: nrichers <[email protected]> Co-authored-by: Beck <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Internal Notes for Reviewers
Includes PRs:
mainbranch #339@nrichers I'm a little confused at this step, some of these changes GH is showing we've already pushed to
prodbefore. 🤔 Am I doing it wrong?