Skip to content
This repository has been archived by the owner on Apr 13, 2021. It is now read-only.

Refactor Staging #87

Merged
merged 1 commit into from Feb 10, 2019
Merged

Conversation

techman83
Copy link
Member

This should address most of the issues we see with staging and allow us to follow our regular practice of removing branches that get merged.

Additions

  • Adds testing function to remove remote branches
  • Adds test for when a remote branch doesn't exist, but exists locally

Fixes

  • Staged ckans that are updated multiple times, but have yet to be merged into master
  • Exceptions from files that have no changes and don't require a commit are ignored

…t been merged

Also test to ensure we don't blow up when our upstream branch doesn't exist - fixes KSP-CKAN#85 and fixes KSP-CKAN#86
@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 91.631% when pulling 1f2b092 on techman83:85_86_staging_fixes into 1384ac2 on KSP-CKAN:master.

@HebaruSan
Copy link
Member

HebaruSan commented Feb 8, 2019

Is this fixing #85 and/or #86?

Never mind, the comments make clear that it is.

Copy link
Member

@HebaruSan HebaruSan left a comment

Choose a reason for hiding this comment

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

I honestly can't keep the problems or solutions straight in my head here, but I don't have changes to suggest, so it doesn't make sense to hold this up. At worst we can continue to iterate on this as necessary.

@techman83
Copy link
Member Author

That's fair 🙂 It was mostly to catch anything silly as it was a 2 hour sprint after a full days work. Also so that someone other than me has at least seen under the covers.

@techman83 techman83 merged commit 98eb4e8 into KSP-CKAN:master Feb 10, 2019
@techman83 techman83 deleted the 85_86_staging_fixes branch February 10, 2019 05:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants