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

Add git branch support, non-linear tag support and simplify git repo logic #1404

Merged
merged 16 commits into from
Mar 3, 2023

Conversation

jeff-mccoy
Copy link
Contributor

@jeff-mccoy jeff-mccoy commented Mar 2, 2023

Description

This refactors our git logic to be more in line with the goals of #1405

Related Issue

Fixes #1405

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (security config, docs update, etc)

Checklist before merging

@netlify
Copy link

netlify bot commented Mar 2, 2023

Deploy Preview for zarf-docs canceled.

Name Link
🔨 Latest commit 79aa502
🔍 Latest deploy log https://app.netlify.com/sites/zarf-docs/deploys/6402095871d07b0008d90397

@Racer159 Racer159 changed the title Git kiss Refactor and simplify git repository logic Mar 2, 2023
@Racer159 Racer159 added needs-docs PR Label - Docs required to merge needs-tests PR Label - Tests required to merge labels Mar 2, 2023
@jeff-mccoy jeff-mccoy removed the needs-tests PR Label - Tests required to merge label Mar 2, 2023
@Racer159 Racer159 removed the needs-docs PR Label - Docs required to merge label Mar 2, 2023
@Racer159
Copy link
Contributor

Racer159 commented Mar 2, 2023

Backwards compatibility testing is being shunted from this in favor of: #1404. Below is a manual screenshot from the git package built from current main:

image
image

@jeff-mccoy jeff-mccoy changed the title Refactor and simplify git repository logic Add git branch support, non-linear tag support and simplify git repo logic Mar 3, 2023
@Racer159 Racer159 merged commit 1588a98 into main Mar 3, 2023
@Racer159 Racer159 deleted the git-kiss branch March 3, 2023 20:17
Noxsios pushed a commit that referenced this pull request Mar 8, 2023
…logic (#1404)

## Description

This refactors our git logic to be more in line with the goals of #1405 

## Related Issue

Fixes #1405

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed

---------

Co-authored-by: Wayne Starr <[email protected]>
Co-authored-by: Wayne Starr <[email protected]>
Noxsios pushed a commit that referenced this pull request Mar 8, 2023
…logic (#1404)

This refactors our git logic to be more in line with the goals of #1405

Fixes #1405

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed

---------

Co-authored-by: Wayne Starr <[email protected]>
Co-authored-by: Wayne Starr <[email protected]>
Racer159 added a commit that referenced this pull request Mar 8, 2023
…logic (#1404)

This refactors our git logic to be more in line with the goals of #1405

Fixes #1405

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed

---------

Co-authored-by: Wayne Starr <[email protected]>
Co-authored-by: Wayne Starr <[email protected]>
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.

Our git logic should be refactored to be simpler and reduce the likelihood of errors being introduced
4 participants