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

Open
4 of 14 tasks
LoTerence opened this issue Nov 7, 2024 · 0 comments · May be fixed by #608
Open
4 of 14 tasks

Merge develop branch into main branch #610

LoTerence opened this issue Nov 7, 2024 · 0 comments · May be 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
  • Write documentation

This issue Depends on these deployment tasks:

  • Important: deploy develop branch to 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
  • Migrate build-deploy-stage.yml gh action to v4 (actions/checkout@v3)
  • 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:

  • Write Documentation about how the stage docker environment works.

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
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
Status: 🏗 In progress
Development

Successfully merging a pull request may close this issue.

2 participants