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

For publication/deploy on Thursday 8 December 2022 #174

Merged
merged 35 commits into from
Dec 8, 2022
Merged

Conversation

alflennik
Copy link
Contributor

@alflennik alflennik commented Dec 7, 2022

Hi @shawna-slh and @SteveALee, this PR includes the content we would like to deploy tomorrow on December 8, 2022.

The deploy will include support for aria-practices' new content reorganization which was merged today. The main changes to wai-aria-practices are below:

It should be released simultaneously with redirects from the previous URLs to new URLs, which will be handled by @deniak (see #172 for more information).

Preview of how the site should appear is here: aria-practices.netlify.app/aria/apg/

Please let us know if you have any additional concerns. cc @mcking65 @a11ydoer @s3ththompson

Requested publication here

@netlify
Copy link

netlify bot commented Dec 7, 2022

Deploy Preview for aria-practices ready!

Name Link
🔨 Latest commit a7714b7
🔍 Latest deploy log https://app.netlify.com/sites/aria-practices/deploys/6391f924dc3b7b00082067c1
😎 Deploy Preview https://deploy-preview-174--aria-practices.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@netlify
Copy link

netlify bot commented Dec 7, 2022

Deploy Preview for wai-aria-practices2 failed.

Name Link
🔨 Latest commit a7714b7
🔍 Latest deploy log https://app.netlify.com/sites/wai-aria-practices2/deploys/6391f924dc3b7b00082067bd

@a11ydoer
Copy link

a11ydoer commented Dec 7, 2022

@alflennik Do you know why this deployment is failed? The detailed deploy logs are not loading. does this imply that the change cannot be published this week unless @shawna-slh 's team do something about it or do we just need her approval?

@alflennik
Copy link
Contributor Author

@a11ydoer thank you for bringing up the failed checks. They are nothing to worry about. They are caused by an old Netlify account which no longer works, and we are currently in the process of updating the Netlify account associated with the project. See the issue here for more information.

@a11ydoer
Copy link

a11ydoer commented Dec 7, 2022

Great!

@SteveALee
Copy link
Contributor

Very hard to tell on mobile but there seem to be merge conflicts to be resolved. Netlify wont build if conflicts.

I see commits I made to fix the dependency problem so that should be OK.

@mcking65
Copy link
Contributor

mcking65 commented Dec 8, 2022

@alflennik I don't understand the merge conflict. Looks like git recognized removal of everything from /content except for that one file. content/about.md does not exist in the main branch. When merging publication into main, the file is in both content and aria/apg/about, so perhaps deleting, commiting, and pushing ... I wasn't sure; will leave it to you or someone else on the eng team to resolve.

@SteveALee
Copy link
Contributor

I'll checkin with Shawn, sounds like this is for today.

The thing I discovered recently is PRs use a full 3 way differentce, not 2 way. So it does not just compare current state but changes on both branches from a common ancestor. So if the file changed on both branches there may a conflict that requires human intervention. The trouble is it doesn't present the issue in any understandable way.

@shawna-slh
Copy link
Contributor

@alflennik given there are issues (above), I would like to do this deployment when you are available. Denis and I are ready early. Please ping me in IRC when you are. I joined #aria-apg

Copy link
Contributor

@shawna-slh shawna-slh left a comment

Choose a reason for hiding this comment

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

This PR cannot be merged "This branch has conflicts that must be resolved"

@alflennik
Copy link
Contributor Author

@shawna-slh Good morning, I fixed the conflict. I will message you on IRC as well.

@shawna-slh shawna-slh merged commit f069721 into publication Dec 8, 2022
@mcking65
Copy link
Contributor

mcking65 commented Dec 8, 2022

@shawna-slh how long does it take for the changes to be live once they are merged into the publication branch? I want to do some testing of redirects as soon as possible after the deploy.

@shawna-slh
Copy link
Contributor

shawna-slh commented Dec 8, 2022

@mcking65 The deploy failed and @SteveALee is not available to troubleshoot it. Unless Steve becomes available, we will have to revert and postpone the update. Sorry.

@mcking65
Copy link
Contributor

mcking65 commented Dec 8, 2022

Oh, bummer, thx for that update.

@shawna-slh
Copy link
Contributor

shawna-slh commented Dec 8, 2022

@michael-n-cooper says he'll follow up with you to get info to determine when we might have resources to help troubleshoot the issue with this PR not deploying. [edited]

@shawna-slh
Copy link
Contributor

Data point: The WAI website deploy worked before this merge. And when this merge was reverted, and a different PR merged, the deploy worked. So it is indeed a problem with this PR.

@SteveALee
Copy link
Contributor

Sorry but a bicycle crash has put me out of action for a bit. Nothing too bad. It's not obvious what problem is so will investigate next week

@alflennik
Copy link
Contributor Author

First of all, my condolences @SteveALee, take as much time as you need to get better. Glad to hear it's nothing too bad.

About the deploy, I'm not sure if I'll be able to help since I don't know what the issue is. However, there is one issue I just fixed which might be related - I noticed the Gem lock file was missing some metadata that would allow the Gems to work on different architectures.

Do we know @shawna-slh if Steve will be able to help get this deploy over the finish line?

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.

7 participants