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

W3-Jan-17-2025-v1 #835

Open
wants to merge 40 commits into
base: main
Choose a base branch
from
Open

W3-Jan-17-2025-v1 #835

wants to merge 40 commits into from

Conversation

w3creatives
Copy link
Collaborator

@w3creatives w3creatives commented Jan 17, 2025

What's included

This PR resolves the following issues:

Priority: High

Priority: Medium

Priority: Low

Priority: Unknown

Notes

This PR will also update the of Drupal core and some modules.

Dependencies changed (versions and patches), so install new ones.

Theme changes, so need to rebuild the theme.

Quite a few config changes.

Deployment instructions

  1. backup DB
  2. deploy code
  3. install dependencies
  4. update DB
  5. import configuration
  6. rebuild theme
  7. Load a update-the-db URL (for Places: cannot edit page (editorial team not on Fre side) #817) and for - [ ] Some roles cannot create/edit some basic pages due to missing/invalid editorial team #718
    • /team_department_update
  8. Cache rebuild drush cr

@w3creatives
Copy link
Collaborator Author

w3creatives commented Jan 17, 2025

Hi @leeomara Could you please look into these 3 files with conflicts?

This file docroot/themes/custom/yukonca_glider/yukonca_glider.theme was updated on urgent request. - #818

@leeomara
Copy link
Member

Some of these changes look like duplicates of what already landed in #main as part of #825.

@leeomara
Copy link
Member

leeomara commented Feb 4, 2025

I need to re-deploy, to apply the changes that landed here since Jan 24.

@leeomara
Copy link
Member

leeomara commented Feb 4, 2025

I've re-deployed to UAT.

@leeomara
Copy link
Member

leeomara commented Feb 6, 2025

I think we need to revisit how we are using merge requests and branches. This merge request has been open for 3 weeks, has been deployed to UAT twice, and is still getting changes pushed to it.

Challenges I find with this current approach:

  • it's hard to test against a moving target
  • it's hard to know what has been deployed where
  • it's hard to have confidence that we can merge/ship this branch to prod

I'm open to suggestions/discussion about this.

@w3creatives
Copy link
Collaborator Author

May I ask a couple of questions?

  1. Did you last merge the code into UAT from main_w3_staging on Feb 4th, 2025?
  2. And the issues are the related to the updates occurring after after your last merge?

FYI, we were initially assuming that main_w3_staging will be merged into main at some point and that was why; we took this approach. But if you want to revisit what was merged into main_w3_staging, then you can review these PRs:

https://github.com/ytgov/yukon-ca/pulls?q=is%3Apr+is%3Aclosed

Alternatively, we can resubmit the PR based on the pending issues if you can provide us date after which we should resubmit the updates.

Open to suggestions.

@leeomara
Copy link
Member

leeomara commented Feb 7, 2025

UAT has been updated with this, up to 5aecd0d.

@leeomara
Copy link
Member

Now that I pushed forward one commit to fix #804, as part of #859, this merge request now has a conflict to fix.

leeomara added a commit that referenced this pull request Mar 3, 2025
From Entity Reference to Paragraph

I believe this relates to #748

This looks like it's a cherry-pick of just part of
- #835
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment