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

Improved build log page for issue 2622 #2669

Merged
merged 1 commit into from
Jan 19, 2022
Merged

Improved build log page for issue 2622 #2669

merged 1 commit into from
Jan 19, 2022

Conversation

nguyenhung15913
Copy link
Contributor

Issue This PR Addresses

fixes #2622

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

  • Made the message more clear if there is no current or previous build
  • Displaying the previous build if there is one and there is no current build

Screenshot

  • No current or previous build
    no-build
  • No current build but there is a previous build
    previous-build
  • If there is a current build
    current-build

How to test locally

From the root directory

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
  • 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)

@gitpod-io
Copy link

gitpod-io bot commented Jan 18, 2022

humphd
humphd previously approved these changes Jan 18, 2022
Copy link
Contributor

@humphd humphd left a comment

Choose a reason for hiding this comment

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

I'm reworking this code in #2653 too, so we can take this and I can incorporate it into mine.

DukeManh
DukeManh previously approved these changes Jan 18, 2022
Copy link
Contributor

@DukeManh DukeManh left a comment

Choose a reason for hiding this comment

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

I think this and #2665 will be improved in @humphd's PR.

TDDR
TDDR previously approved these changes Jan 19, 2022
Copy link
Contributor

@TDDR TDDR left a comment

Choose a reason for hiding this comment

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

Just needs a rebase and you are good to merge

humphd
humphd previously approved these changes Jan 19, 2022
@humphd humphd added the area: dashboard Related to Telescope's dashboard (the page that has stats) label Jan 19, 2022
@humphd humphd added this to the 2.5 Release milestone Jan 19, 2022
DukeManh
DukeManh previously approved these changes Jan 19, 2022
@nguyenhung15913
Copy link
Contributor Author

Hi everyone, I just pressed the "update branch" something and it create this commit "23b0064", "Merge branch 'master' into issue-2622". is there any issue with it ? @humphd @DukeManh @TDDR

@humphd
Copy link
Contributor

humphd commented Jan 19, 2022

@nguyenhung15913 correct, we don't want to do this. It creates a new merge commit, merging master into your branch. We never want to do this. We want to merge your branch into master. To do this, we prefer rebasing and squashing.

@humphd
Copy link
Contributor

humphd commented Jan 19, 2022

@nguyenhung15913
Copy link
Contributor Author

@nguyenhung15913 correct, we don't want to do this. It creates a new merge commit, merging master into your branch. We never want to do this. We want to merge your branch into master. To do this, we prefer rebasing and squashing.

So now I have to revert the commit and rebase right ?

@humphd
Copy link
Contributor

humphd commented Jan 19, 2022

If you rebase, it should get rid of the merge commit. But yes, you could also revert and then rebase.

@nguyenhung15913
Copy link
Contributor Author

awesome

Copy link
Contributor

@humphd humphd left a comment

Choose a reason for hiding this comment

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

Nice job

@nguyenhung15913 nguyenhung15913 merged commit cc3aef1 into Seneca-CDOT:master Jan 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: dashboard Related to Telescope's dashboard (the page that has stats)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build log claims to not be able to get build status when no build running
4 participants