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

Bring silk src into silk-release #89

Merged

Conversation

jrussett
Copy link
Contributor

@jrussett jrussett commented Aug 2, 2023

We had originally setup silk in an enitre other repo with the intention that it could be imported, used, and extended by other projects. This never happened and now we have a separate repo for silk when it is only used in `silk-release.

This commit takes code.cloudfoundry.org/silk at commit 8e48b8d1e6812ccd3da7c93fb30728ad1d9000ed, and folds it into silk-release under src/code.cloudfoundry.org/silk.

Other changes worth mentioning:

  • scripts/test.sh and scripts/start-db-helper taken from cf-networking, e.g. https://github.com/cloudfoundry/cf-networking-release/blob/develop/scripts/test.sh - the silk tests now require some databases to run
  • removes scripts from the silk source repo
  • Updates bosh packaging specs for the new pakage import path
  • Consolidates modules/modules.go and tools/tools.go since they seem to do the same thing and we don't need to import the silk stuff

Addresses: cloudfoundry/silk#52

#185149418

@jrussett jrussett requested a review from a team as a code owner August 2, 2023 21:25
reneighbor added a commit to cloudfoundry/silk that referenced this pull request Aug 2, 2023
This repo is being merged into silk-release. See the following:
- #52
- cloudfoundry/silk-release#89

[#185149418](https://www.pivotaltracker.com/story/show/185149418)

Signed-off-by: Josh Russett <jrussett@vmware.com>
@jrussett jrussett changed the title [DRAFT] Bring silk src into silk-release Bring silk src into silk-release Aug 3, 2023
We had originally setup silk in an enitre other repo with the intention
that it could be imported, used, and extended by other projects.
This never happened and now we have a separate repo for `silk` when it
is only used in `silk-release.

This commit takes [code.cloudfoundry.org/silk at commit
8e48b8d1e6812ccd3da7c93fb30728ad1d9000ed](cloudfoundry/silk@8e48b8d),
and folds it into `silk-release` under `src/code.cloudfoundry.org/silk`.

Other changes worth mentioning:
- `scripts/test.sh` and `scripts/start-db-helper` taken from
  `cf-networking`, e.g. https://github.com/cloudfoundry/cf-networking-release/blob/develop/scripts/test.sh
    - the `silk` tests now require some databases to run
- removes scripts from the `silk` source repo
- Updates bosh packaging specs for the new pakage import path
- Consolidates `modules/modules.go` and `tools/tools.go` since they seem
  to do the same thing and we don't need to import the silk stuff

Addresses: cloudfoundry/silk#52

[#185149418](https://www.pivotaltracker.com/story/show/185149418)

Signed-off-by: Renee Chu <reneec@vmware.com>
@jrussett jrussett force-pushed the consolidate-silk-into-silk-release-185149418 branch from 0affaef to 96abf2b Compare August 3, 2023 00:11
winkingturtle-vmw pushed a commit to cloudfoundry/silk that referenced this pull request Aug 3, 2023
This repo is being merged into silk-release. See the following:
- #52
- cloudfoundry/silk-release#89

[#185149418](https://www.pivotaltracker.com/story/show/185149418)

Signed-off-by: Josh Russett <jrussett@vmware.com>
Co-authored-by: Renee Chu <reneec@vmware.com>
Copy link
Contributor

@winkingturtle-vmw winkingturtle-vmw left a comment

Choose a reason for hiding this comment

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

LGTM

@winkingturtle-vmw winkingturtle-vmw merged commit 0b64ab4 into develop Aug 3, 2023
1 check passed
jrussett added a commit to jrussett/community that referenced this pull request Aug 4, 2023
We had originally setup silk in an enitre other repo with the intention
that it could be imported, used, and extended by other projects.
This never happened and now we have a separate repo for `silk` when it
is only used in `silk-release.

We have moved `silk` into `silk-release` and therefore `silk` is no
longer necessary.

More details:
- cloudfoundry/silk#52
- cloudfoundry/silk-release#89

[#185149418](https://www.pivotaltracker.com/story/show/185149418)
@jrussett jrussett deleted the consolidate-silk-into-silk-release-185149418 branch August 4, 2023 00:26
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