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

Rebuild of OUHFT branch #1

Open
4 of 6 tasks
marshalc opened this issue Feb 13, 2024 · 7 comments
Open
4 of 6 tasks

Rebuild of OUHFT branch #1

marshalc opened this issue Feb 13, 2024 · 7 comments
Assignees
@marshalc
Labels
enhancement New feature or request

Comments

@marshalc
Copy link

marshalc commented Feb 13, 2024 •
edited
Loading

In an attempt to more closely track the modifications we've made to the upstream project for local needs, we're rebuilding our main tracking branch, but pulling out all the feature changes we've added into their own sub-branches so that we can more closely track their progress in the future.

This issue is going to be the parent ticket for these changes which will include:

  1. Adding NHS Colour options + OUH Brandmark + related style changes
  2. Implementing PageFind in place of the default JS search solution
  3. Adding our local documentation pages
  4. Adding our local Gitlab build templates
  5. Image Gallery Short-code
  6. Plotly Short-code
@marshalc marshalc added the enhancement New feature or request label Feb 13, 2024
@marshalc marshalc self-assigned this Feb 13, 2024
@marshalc
Copy link
Author

This is happening following work related to google#1793 and where I made a bit of a mess to our current branch.

@marshalc
Copy link
Author

The (smarter?) process will be to branch from the last "stable" release - https://github.com/google/docsy/tree/v0.8.0 - Implement our local changes via their own feature branches, and then play the latest main changes forward to bring the Head of ouhft to level with the current Head of main, fixing each feature branch as needed to accommodate the changing base and merging them in... then things might get a little messy again as we try to stay current.

@marshalc
Copy link
Author

Initial branch setup:

  • New clone of repo git clone https://github.com/ouhft/docsy.git ./docsy-repo
  • cd docsy-repo
  • Can't do git checkout -b ouhft tags/v0.8.0 as fatal: 'tags/v0.8.0' is not a commit and a branch 'ouhft' cannot be created from it. This is because this forking of the google project has not pulled any of the upstream tags across with it. Thus to achieve a new branch from the relevant commit, we need to do...
  • git checkout -b ouhft 6bb4f99d1eab4976fb80d1488c81ba12b1715c05
  • Then push up via git push --set-upstream origin ouhft

NB: at this time, live build processes are failing because of the loss of the CI Build Templates from this branch!

@marshalc
Copy link
Author

marshalc commented Feb 14, 2024 •
edited
Loading

First commit 03455fb used to rename the Hugo Module to be distinct from the upstream Google variant.

marshalc pushed a commit that referenced this issue Feb 14, 2024
@rbfmarshallc
Debugging 3.0.0 ci build script - currently working - Issue #1
1385f42
marshalc pushed a commit that referenced this issue Feb 14, 2024
@rbfmarshallc
Build failed, couldn't find config-colours, so debugging... #1
030e8fe
marshalc pushed a commit that referenced this issue Feb 14, 2024
@rbfmarshallc
found config-colours... #1
564bd1a
@marshalc
Copy link
Author

marshalc commented Feb 14, 2024 •
edited
Loading

As of 564bd1a (branch 0-8-0+nhs-colours) we have working primary colour selection. Colour choices: amber, blue (Default), brown, cyan, deep-orange, deep-purple, green, grey, indigo, light-blue, light-green, lime, orange, pink, purple, red, teal, & yellow.

marshalc pushed a commit that referenced this issue Feb 14, 2024
@rbfmarshallc
Adding OUH / NHS Branding as per #1
da3dfea
marshalc pushed a commit that referenced this issue Feb 14, 2024
@rbfmarshallc
Adding OUH / NHS Branding as per #1 - fixing sizes of logo, and footn…
27db33f 
…otes
marshalc pushed a commit that referenced this issue Feb 14, 2024
@rbfmarshallc
Last tweak to the footnote style to wrap up the NHS customisations fo…
97fad27 
…r Issue #1
marshalc pushed a commit that referenced this issue Feb 14, 2024
@rbfmarshallc
Adding NHS Branding per Issue #1 to the ouhft branch at Docsy v0.8.0
9bbebbf 
Squashed commit of the following:

commit 97fad27
Author: Carl Marshall <carl.marshall@ouh.nhs.uk>
Date:   Wed Feb 14 19:54:32 2024 +0000

    Last tweak to the footnote style to wrap up the NHS customisations for Issue #1

commit 27db33f
Author: Carl Marshall <carl.marshall@ouh.nhs.uk>
Date:   Wed Feb 14 18:01:23 2024 +0000

    Adding OUH / NHS Branding as per #1 - fixing sizes of logo, and footnotes

commit da3dfea
Author: Carl Marshall <carl.marshall@ouh.nhs.uk>
Date:   Wed Feb 14 17:57:14 2024 +0000

    Adding OUH / NHS Branding as per #1

commit 564bd1a
Author: Carl Marshall <carl.marshall@ouh.nhs.uk>
Date:   Wed Feb 14 16:53:33 2024 +0000

    found config-colours... #1

commit 030e8fe
Author: Carl Marshall <carl.marshall@ouh.nhs.uk>
Date:   Wed Feb 14 16:50:25 2024 +0000

    Build failed, couldn't find config-colours, so debugging... #1

commit 25fa8a6
Author: Carl Marshall <carl.marshall@ouh.nhs.uk>
Date:   Wed Feb 14 16:38:52 2024 +0000

    Build failed, couldn't find config-colours, so debugging...

commit 3d38c49
Author: Carl Marshall <carl.marshall@ouh.nhs.uk>
Date:   Wed Feb 14 13:23:36 2024 +0000

    First attempt add adding primary colour by config logic in
@marshalc
Copy link
Author

marshalc commented Feb 15, 2024 •
edited
Loading

Excellent news, Docsy 0.9.0 has just been released, so that can be neatly wrapped up into this upgrade cycle!

Changes merged into ouhft branch at 47c9d95

@marshalc
Copy link
Author

Currently synced with v0.10.0 release of Docsy.

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

@marshalc marshalc

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@marshalc