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

Usagov 2122 update custom code #2126

Merged
merged 14 commits into from
Jan 10, 2025
Merged

Usagov 2122 update custom code #2126

merged 14 commits into from
Jan 10, 2025

Conversation

whitealbum
Copy link
Contributor

@whitealbum whitealbum commented Dec 18, 2024

Jira Task

https://cm-jira.usa.gov/browse/USAGOV-2122

Description

Added to ability to check for PHP8.3 issues

Type of Changes

  • New Feature
  • Bugfix
  • Frontend (Twig, Sass, JS)
    • Add screenshot showing what it should look like
  • Drupal Config (requires "drush cim")
  • New Modules (requires rebuild)
  • Documentation
  • Infrastructure
    • CMS
    • WAF
    • WWW
    • Egress
    • Tools
    • Cron
  • Other

Testing Instructions

run bin/composer php-compatibility

Change Requirements

  • Requires New Documentation (Link: {})
  • Requires New Config
  • Requires New Content

Validation Steps

  • Test instruction 1
  • Test instruction 2
  • Test instruction 3

Security Review

  • Adds/updates software (including a library or Drupal module)
  • Communication with external service
  • Changes permissions or workflow
  • Requires SSPP updates

Reviewer Reminders

  • Reviewed code changes
  • Reviewed functionality
  • Security review complete or not required

Post PR Approval Instructions

Follow these steps as soon as you merge the new changes.

  1. Go to the USAGov Circle CI project.
  2. Find the commit of this pull request.
  3. Build and deploy the changes.
  4. Update the Jira ticket by changing the ticket status to Review in Test and add a comment. State whether the change is already visible on cms-dev.usa.gov and beta-dev.usa.gov, or if the deployment is still in process.

Copy link
Member

@akf akf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good to me! I flagged Gene on one benefits-finder file, so I'm not merging just yet.

@akf
Copy link
Member

akf commented Dec 27, 2024

Heads up, there's a merge conflict now.

@akf
Copy link
Member

akf commented Jan 8, 2025

@whitealbum Gene and I are both happy with this, but now it has merge conflicts. Could you please update?

Copy link
Member

@akf akf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Taking your note about the composer merge to heart, I tore down my site and tried to do a full rebuild via bin/init. I'm hitting a couple of issues with composer install:

  • a warning that my composer.lock file is out of date. Usually when we've merged this just means that the content-hash value needs to be updated, and running composer update --lock will take care of it
  • a full-blown error:
Warning: The lock file is not up to date with the latest changes in composer.json. You may be getting outdated dependencies. It is recommended that you run `composer update` or `composer update <package name>`.
- Required (in require-dev) package "rector/rector" is not present in the lock file.
This usually happens when composer files are incorrectly merged or the composer.json file is manually edited.
Read more about correctly resolving merge conflicts https://getcomposer.org/doc/articles/resolving-merge-conflicts.md
and prefer using the "require" command over editing the composer.json file directly https://getcomposer.org/doc/03-cli.md#require-r 

That says "warning" but my build failed at that point.

Copy link
Member

@akf akf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirming that the current version of this branch builds successfully for me. (Unfortunately another merge round is needed.)

Copy link
Member

@akf akf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All working now.

@akf akf merged commit 80cf6a5 into dev Jan 10, 2025
4 of 5 checks passed
@akf akf deleted the USAGOV-2122-update-custom-code branch January 10, 2025 21:28
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