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 RACK UI #752

Merged
merged 66 commits into from
Aug 8, 2022
Merged

Add RACK UI #752

merged 66 commits into from
Aug 8, 2022

Conversation

weisenje
Copy link
Contributor

@weisenje weisenje commented Aug 8, 2022

This is the initial rev of the RACK UI.

tuxji and others added 30 commits July 12, 2022 09:22
continuous.yml: Build Docker image with tag set to branch's short name
(usually dev, but could be dev-test).  Push only images built from dev
or dev-test branches to Docker Hub.
continuous.yml: Build Docker image with tag set to dev, dev-test, or
other depending on branch name.  Push only dev and dev-test images to
Docker Hub, however.
@weisenje weisenje marked this pull request as ready for review August 8, 2022 11:58
@weisenje weisenje removed the request for review from cuddihyge August 8, 2022 12:08
Copy link
Contributor

@tuxji tuxji left a comment

Choose a reason for hiding this comment

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

+1 (after you address comments below)

GitHub reports a conflict between this PR and the master branch. When you rebase your dev-test branch on the master branch to resolve that conflict, I think it would be a good idea to squash your commits down to a single commit as well. Otherwise the rebase will report a conflict somewhere in one of the 65 commits, pause, wait for you to fix the conflict before resuming rebasing, probably report another conflict in another commit, pause again, etc.

You have to use git fetch && git rebase -i origin/master and manually edit the list of 65 commits in a text editor to squash your commits down to 1 commit. The first commit should remain "pick" and the rest of the commits should be changed from "pick" to "squash" or just "s". Git will append all the commits' messages into a single commit message and let you edit that commit message to clean it up before completing the squash.

The difference between the above command and git fetch && git rebase origin/master (without the "-i") is that the latter command will rebase all 65 commits one after another, and you probably will have to fix conflicts and continue rebasing several times. It's simpler to squash the commits together into a single commit so that you'll have to fix any conflicts in that commit only once.

.github/workflows/actions/download/action.yml Show resolved Hide resolved
.github/workflows/continuous.yml Show resolved Hide resolved
rack-box/scripts/install.sh Show resolved Hide resolved
rack-ui/app.py Outdated Show resolved Hide resolved
rack-ui/rackui.service Outdated Show resolved Hide resolved
@weisenje weisenje merged commit 6ad820a into master Aug 8, 2022
@weisenje weisenje deleted the dev-test branch August 8, 2022 18:53
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.

None yet

2 participants