Skip to content

Updates readme for local builds and removes .DStore#69

Merged
iansk merged 3 commits intotwistlock:masterfrom
emanic:add-local-build
Jul 1, 2020
Merged

Updates readme for local builds and removes .DStore#69
iansk merged 3 commits intotwistlock:masterfrom
emanic:add-local-build

Conversation

@emanic
Copy link
Contributor

@emanic emanic commented Jun 2, 2020

  • Adds files and instructions so contributors can make local builds

@emanic emanic requested a review from iansk June 2, 2020 22:24
@iansk
Copy link
Collaborator

iansk commented Jun 2, 2020

@emanic This PR touches 54 files! Please fix it up, and resubmit.

@emanic
Copy link
Contributor Author

emanic commented Jun 2, 2020

I think they are required @iansk

@iansk
Copy link
Collaborator

iansk commented Jun 3, 2020

@emanic Yup, you're right.

@iansk
Copy link
Collaborator

iansk commented Jun 26, 2020

@emanic I worked on your branch a bit, and merged it into master already. Can you check out master and make sure it works for you? Once you verify, I'll close this PR.

@iansk
Copy link
Collaborator

iansk commented Jun 26, 2020

See the updated and merged PR here: #96

@emanic
Copy link
Contributor Author

emanic commented Jun 26, 2020

OK thanks @iansk I'll take a look 👍

@emanic emanic force-pushed the add-local-build branch 2 times, most recently from 5431ba6 to a771498 Compare July 1, 2020 17:23
@emanic
Copy link
Contributor Author

emanic commented Jul 1, 2020

@iansk OK I rebased this off the latest master and updated the README.md. New build.sh runs much better. Thanks... Can you review this PR again? I see you added a bunch of files, but I still have some here in this PR. I think we may need these.

@iansk
Copy link
Collaborator

iansk commented Jul 1, 2020

@emanic My merged branch (now in master) was based off this branch, so it contains all the files you added. I moved some files around to make the repo cleaner. Please incorporate my work in this branch by either rebasing this branch off of master, or merging master in your branch. Once you've done this, I'll merge your PR.

@emanic emanic force-pushed the add-local-build branch from 565ea9e to 6ca5cea Compare July 1, 2020 22:37
@emanic emanic changed the base branch from master to aqsa-ecs July 1, 2020 22:43
@emanic emanic changed the base branch from aqsa-ecs to master July 1, 2020 22:43
@emanic emanic force-pushed the add-local-build branch from 6ca5cea to 70f45d8 Compare July 1, 2020 22:44
@emanic
Copy link
Contributor Author

emanic commented Jul 1, 2020

@iansk OK yeah I did rebase it, but it looks like you renamed the files directory and that didn't get picked up. So I think this should be what we need then.

@emanic emanic changed the title Adds info and files for local builds Adds some additional info and files for local builds Jul 1, 2020
@emanic
Copy link
Contributor Author

emanic commented Jul 1, 2020

OK nvm, I see that you moved the gem and python script into _build. OK maybe you can take a look now.

@emanic emanic changed the title Adds some additional info and files for local builds Updates readme for local builds and removes .DStore Jul 1, 2020
iansk
iansk reviewed Jul 1, 2020
View reviewed changes
Copy link
Collaborator

@iansk iansk left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @emanic. Merging this now.

@iansk iansk merged commit c7c089d into twistlock:master Jul 1, 2020
@emanic emanic deleted the add-local-build branch July 1, 2020 23:49
iansk pushed a commit that referenced this pull request Dec 18, 2020
@grevach
Update system requirements for Galileo (#69)
febc9ca
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iansk iansk iansk left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@emanic @iansk