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

Moving current build to prev when a new build is started #2392

Merged
merged 1 commit into from
Oct 27, 2021
Merged

Moving current build to prev when a new build is started #2392

merged 1 commit into from
Oct 27, 2021

Conversation

dhillonks
Copy link
Contributor

@dhillonks dhillonks commented Oct 25, 2021

Issue This PR Addresses

Fixes #2384 (Autodeployment server not remembering previous build info).

Type of Change

  • Bugfix: Change which fixes an issue
  • New Feature: Change which adds functionality
  • Documentation Update: Change which improves documentation
  • UI: Change which improves UI

Description

Assigning the current build to previous in so that the previous build information is not null.

image

Checklist

  • Quality: This PR builds and passes our npm test and works locally
  • Tests: This PR includes thorough tests or an explanation of why it does not; N/A for this pr
  • Screenshots: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not (if applicable)
  • Documentation: This PR includes updated/added documentation to user exposed functionality or configuration variables are added/changed or an explanation of why it does not(if applicable)

tools/autodeployment/builds.js Outdated Show resolved Hide resolved
tools/autodeployment/builds.js Show resolved Hide resolved
@humphd humphd marked this pull request as ready for review October 25, 2021 13:35
@humphd humphd requested a review from manekenpix October 25, 2021 13:35
@dhillonks dhillonks requested a review from humphd October 25, 2021 16:54
humphd
humphd previously approved these changes Oct 25, 2021
@humphd
Copy link
Contributor

humphd commented Oct 26, 2021

@dhillonks you've merged master into your branch, which we don't want. Probably you did a git pull upstream master into your branch? If so, be aware that this will do a fetch and merge.

Let's undo your merge commit like so:

# update your local master branch to what's on the upstream
git checkout master
git pull upstream master

# reset your branch to the commit before you merged
git checkout -B issue-2384-remember-prev-build 0b76fd39ddae5bbba5fc3280c4702d36c0b77416

# rebase onto master, and squash your two commits together
git rebase -i master

# push this updated branch here so we can merge
git push origin issue-2384-remember-prev-build -f

@dhillonks
Copy link
Contributor Author

@dhillonks you've merged master into your branch, which we don't want. Probably you did a git pull upstream master into your branch? If so, be aware that this will do a fetch and merge.

Let's undo your merge commit like so:

# update your local master branch to what's on the upstream
git checkout master
git pull upstream master

# reset your branch to the commit before you merged
git checkout -B issue-2384-remember-prev-build 0b76fd39ddae5bbba5fc3280c4702d36c0b77416

# rebase onto master, and squash your two commits together
git rebase -i master

# push this updated branch here so we can merge
git push origin issue-2384-remember-prev-build -f

@humphd Yes, that is what I had done before. I didn't realise that it was not needed. However, I have followed the steps highlighted above to rebase and update the branch. Could you please take a look again?

@humphd
Copy link
Contributor

humphd commented Oct 26, 2021

You haven't done it correctly. You have 2 nearly identical commits on this branch, and it's still not rebased onto master.

@dhillonks
Copy link
Contributor Author

dhillonks commented Oct 27, 2021

Squashed the commits and rebased it with latest master (wasn't completely in sync in with upstream last time):
image

@humphd humphd merged commit 9c0c798 into Seneca-CDOT:master Oct 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Autodeployment server not remembering previous build info
2 participants