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

SRVCOM-2431 fix page-loader.js for serverless #60508

Merged

Conversation

gabriel-rh
Copy link
Contributor

@gabriel-rh gabriel-rh commented May 24, 2023

Version(s):
main and 4.1

Issue:
SRVCOM-2431

Link to docs preview:

Additional Info:

I have copied the changes from the direct commit to 4.1 and added in new serverless stuff on top.

This needs to be then cherry-picked to 4.1 to take effect

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 24, 2023
@ocpdocs-previewbot
Copy link

@kalexand-rh
Copy link
Contributor

@gaurav-nelson, will you PTAL?

Copy link
Contributor

@gaurav-nelson gaurav-nelson left a comment

Choose a reason for hiding this comment

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

@gabriel-rh Thank you for the PR. Can you please redo this and target the enterprise-4.1 branch? Because the doc site uses the file from that branch. I see some of the changes are already in the _javascripts/page-loader.js file in the enterprise-4.1 branch.

@gabriel-rh
Copy link
Contributor Author

@gaurav-nelson

My plan is to merge to main and then cherry-pick to 4.1. Just to be clear, I started with the js file that is currently on the 4.1 branch to pick up the acs stuff, and then added in the serverless changes on top and PR'd against main.

I think we need to be consistent with the js/css files - either merge to main and then CP to 4.1, or merge directly to 4.1 but at the moment we seem to have a mix. From talking to Aidan yesterday, his workflow for CSS is merge to main, CP to 4.1.

I guess either way works ok, but we need to just choose one - for this PR, I chose to merge to main and then CP to 4.1

@kalexand-rh @aireilly

@gabriel-rh
Copy link
Contributor Author

Gaurav Nelson
12:25 PM
Cool. As long as 4.1 changes are in there it is fine with me. I’ll pick that PR again tomorrow

@gabriel-rh gabriel-rh merged commit 828e3fd into openshift:main May 25, 2023
1 check passed
@gabriel-rh
Copy link
Contributor Author

/cherry-pick enterprise-4.1

@openshift-cherrypick-robot

@gabriel-rh: #60508 failed to apply on top of branch "enterprise-4.1":

Applying: SRVCOM-2431 fix page-loader.js for serverless
Using index info to reconstruct a base tree...
M	_javascripts/page-loader.js
Falling back to patching base and 3-way merge...
Auto-merging _javascripts/page-loader.js
CONFLICT (content): Merge conflict in _javascripts/page-loader.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 SRVCOM-2431 fix page-loader.js for serverless
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick enterprise-4.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@gabriel-rh
Copy link
Contributor Author

Here are the actual changes on 4.1: https://github.com/openshift/openshift-docs/pull/60553/files

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants