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

Merge develop branch into main branch #610

Closed
15 tasks done
LoTerence opened this issue Nov 7, 2024 · 2 comments · Fixed by #608
Closed
15 tasks done

Merge develop branch into main branch #610

LoTerence opened this issue Nov 7, 2024 · 2 comments · Fixed by #608
Assignees
Labels
complexity: large feature: Architecture Pertains to project architecture and settings role: backend Pertains to backend tasks role: devops Pertains to cd/ci tasks size: 8pt Can be done in 31-48 hours

Comments

@LoTerence
Copy link
Member

LoTerence commented Nov 7, 2024

Overview

As a developer, we need the develop and main branches to be in sync so that the code base is clean and we can more easily collaborate.

Deadline: 11/14/2024

Action Items

  • Create a protected branch of main called ava-main-v1 to preserve all their old work. This will separate v1 from v2 (pre backend reset vs post backend reset).
  • Merge main into develop
  • Test all the changes in develop. Ideally in a staging environment
  • Review code (175 files changed)
  • Double check github actions to see if any of them are effected.
  • Mkdocs gh action needs to be updated to deploy from main
  • Execute pull request to Merge develop into main

This issue Depends on these deployment tasks:

  • Important: deploy develop branch to (personal) AWS as a staging environment to fully test current changes.
  • we need an understanding of the exact process of how the main branch is currently deployed to AWS incubator
  • Integrate whitenoise
  • prepare develop branch for a staging deployment

The deployment for the develop branch should be totally separate from what we have now (stage.civictechjobs.org). This way we can test and confirm a develop deployment is fully functional before pushing to main.

Deprioritized tasks:

New issue found while testing stage environment:

  • qualifier page failing to load due to lazy loading not working in current project set up.

Resources/Instructions

https://stage.civictechjobs.org/

Resources

gh action v4 migration docs:

Deploying a django app:

@LoTerence LoTerence added role: backend Pertains to backend tasks size: 5pt Can be done in 19-30 hours feature: Architecture Pertains to project architecture and settings complexity: large labels Nov 7, 2024
@LoTerence LoTerence added this to the 04 - Project Setup milestone Nov 7, 2024
@LoTerence LoTerence self-assigned this Nov 7, 2024
@github-project-automation github-project-automation bot moved this to 🆕 New Issue Approval in P: CTJ: Project Board Nov 7, 2024
@RSkuma RSkuma self-assigned this Nov 8, 2024
@LoTerence LoTerence added role: devops Pertains to cd/ci tasks size: 8pt Can be done in 31-48 hours and removed size: 5pt Can be done in 19-30 hours labels Nov 8, 2024
@LoTerence LoTerence moved this from 🆕 New Issue Approval to 🏗 In progress in P: CTJ: Project Board Nov 8, 2024
@LoTerence
Copy link
Member Author

LoTerence commented Nov 22, 2024

Update 11/21/2024

  • The develop branch has been successfully deployed to our personal AWS account for testing.
  • Devops team will not be able to help us deploy to Incubator until January. They need to work on deploying VRMS first.

This issue will no longer depend on an incubator depoyment. I will test staging on my personal AWS, fix issues found there, then merge to main.

It should be okay because the gh action to deploy the main branch to stage.civictechjobs.org is non-functional and disabled. Therefore the stage website will be uneffected by the change.

Our goal in January will be to work with the incubator/devops team when they are available to fully complete the deployment pipelines. We will sync the new main with a prod deployment, and develop to stage.civictechjobs.org then.

@github-project-automation github-project-automation bot moved this from 🏗 In progress to ✅ Done in P: CTJ: Project Board Dec 6, 2024
@LoTerence LoTerence reopened this Dec 6, 2024
@github-project-automation github-project-automation bot moved this from ✅ Done to 📋 Prioritized Backlog in P: CTJ: Project Board Dec 6, 2024
@LoTerence
Copy link
Member Author

LoTerence commented Dec 9, 2024

This issue is related to #585

@github-project-automation github-project-automation bot moved this from 📋 Prioritized Backlog to ✅ Done in P: CTJ: Project Board Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity: large feature: Architecture Pertains to project architecture and settings role: backend Pertains to backend tasks role: devops Pertains to cd/ci tasks size: 8pt Can be done in 31-48 hours
Projects
Archived in project
Development

Successfully merging a pull request may close this issue.

2 participants