Skip to content

TEMPLATE Sync Fork #43

@NEStock

Description

@NEStock

Please use the "duplicate issue" button in the bottom to create a new issue from this template

Steps

  • Create new branch sync-... from apl-setup
  • Sync master with (from) dandi/dandi-infrastructure:master
    • Using GitHub buttton on this repository's home page
  • Open a pull request to merge master into sync-...
    • master contains all of the dandi/dandi-infrastructure update
    • while sync-... contains all of our EMBER updates
  • Review changes
  • Resolve merge conflicts
    • I usually do this locally by merging master into sync-... and dealing with conflicts in VSCode. Because, we don't want to add any of our EMBER changes to the master branch. We want master to always be "dandi-only" code
  • PR closed

Now, sync-... contains all of the updates both from dandi-instructure and our fork!

  • Open pull request to merge sync-... into apl-setup to update our infrastructure (sandbox + prod) in terraform
  • Review changes
  • Merge PR
  • Apply Terraform changes

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions