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.

Sign up for GitHub

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

Jump to bottom

ci: Mono repo setup #4742

Merged
merged 45 commits into from May 16, 2024
Merged

ci: Mono repo setup #4742

merged 45 commits into from May 16, 2024

Conversation

frascuchon
Copy link
Member

@frascuchon frascuchon commented Apr 24, 2024 •
edited

The mono repo structure will divide the argilla repository into different folders,
each one containing a different part of the project.

The .github/workflows folder will contain the different workflows for each part of the project because of the
limitation of GitHub Actions to have only one workflow folder per repository.

The docs (or argilla-docs) folder will contain the documentation for the whole project.

The rest of the folders will contain the different parts of the project, such as the SDK,
the frontend, and the server.

Each part of the project will have its own CHANGELOG.md file and its own README.md file.

Contribution guidelines will be in the CONTRIBUTING.md file and the code of conduct will be in the CODE_OF_CONDUCT.md file.

A example of the project structure would be:

- .github/workflows/
    |_ argilla.yml # test + build argilla
    |_ argilla-frontend.yml # test + build argilla-frontend
    |_ argilla-server.yml # test + build argilla-server
    ...
- argilla-sdk/ #  -> V2
    |_ CHANGELOG.md
    |_ README.md
    |_ src/
    |_ tests/
    ...
- argilla/ # -> V1
    |_ CHANGELOG.md
    |_ README.md
    |_ src/
    |_ tests/
    ...
- argilla-frontend/
    |_ CHANGELOG.md
    |_ README.md
    |_ package.json
    |_ nuxt.config.ts
	...
- argilla-server/
    |_ CHANGELOG.md
    |_ README.md
    |_ src/
    |_ tests/
    ...
- docs/
    ...
- CONTRIBUTING.md
- CODE_OF_CONDUCT.md
...

@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. area: ci Indicates that an issue or pull request is related to the Continuous Integration (CI) labels Apr 24, 2024
@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. and removed size:S This PR changes 10-29 lines, ignoring generated files. labels Apr 24, 2024
@github-actions GitHub Actions
Copy link

The URL of the deployed environment for this PR is https://argilla-quickstart-pr-4742-ki24f765kq-no.a.run.app

@dosubot dosubot bot added size:XL This PR changes 500-999 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Apr 24, 2024
@frascuchon frascuchon force-pushed the ci/configure-mono-repo branch 5 times, most recently from 9a38b9f to 4b17e53 Compare April 24, 2024 11:05
@frascuchon frascuchon force-pushed the ci/configure-mono-repo branch 2 times, most recently from 38a3518 to 1720536 Compare April 30, 2024 08:51
pre-commit-ci bot and others added 2 commits April 30, 2024 09:06
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
2fed1ef 
for more information, see https://pre-commit.ci
@frascuchon @pre-commit-ci @jfcalvo
ci: Configure main workflow for argilla-frontend (#4760)
0638cc5 
<!-- Thanks for your contribution! As part of our Community Growers
initiative 🌱, we're donating Justdiggit bunds in your name to reforest
sub-Saharan Africa. To claim your Community Growers certificate, please
contact David Berenstein in our Slack community or fill in this form
https://tally.so/r/n9XrxK once your PR has been merged. -->

# Description

This PR adds a basic workflow to build and deploy the `argilla-frontend`
project. The workflow tests and builds frontend resources, uploads
static distribution as an artifact, builds a dev docker image and
deploys it in an isolated environment.



**Type of change**

(Please delete options that are not relevant. Remember to title the PR
according to the type of change)

- [ ] New feature (non-breaking change which adds functionality)
- [ ] Refactor (change restructuring the codebase without changing
functionality)
- [ ] Improvement (change adding some improvement to an existing
functionality)

**How Has This Been Tested**

(Please describe the tests that you ran to verify your changes. And
ideally, reference `tests`)

- [ ] Test A
- [ ] Test B

**Checklist**

- [ ] I added relevant documentation
- [ ] I followed the style guidelines of this project
- [ ] I did a self-review of my code
- [ ] I made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I filled out [the contributor form](https://tally.so/r/n9XrxK)
(see text above)
- [ ] I have added relevant notes to the `CHANGELOG.md` file (See
https://keepachangelog.com/)

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: José Francisco Calvo <jose@argilla.io>
@frascuchon frascuchon changed the title ci: Configure mono repo ci: Prepare mono repo setup May 10, 2024
frascuchon and others added 5 commits May 10, 2024 13:41
@frascuchon
restore more changes from develop
c45f221
@frascuchon @jfcalvo
Apply suggestions from code review
89ff169 
Co-authored-by: José Francisco Calvo <jose@argilla.io>
@frascuchon
ci: moving argilla project (#4816)
1f552b5 
<!-- Thanks for your contribution! As part of our Community Growers
initiative 🌱, we're donating Justdiggit bunds in your name to reforest
sub-Saharan Africa. To claim your Community Growers certificate, please
contact David Berenstein in our Slack community or fill in this form
https://tally.so/r/n9XrxK once your PR has been merged. -->

# Description

Moving the argilla project to `argilla` folder. 



**Type of change**

(Please delete options that are not relevant. Remember to title the PR
according to the type of change)

- [ ] New feature (non-breaking change which adds functionality)
- [ ] Refactor (change restructuring the codebase without changing
functionality)
- [ ] Improvement (change adding some improvement to an existing
functionality)

**How Has This Been Tested**

(Please describe the tests that you ran to verify your changes. And
ideally, reference `tests`)

- [ ] Test A
- [ ] Test B

**Checklist**

- [ ] I added relevant documentation
- [ ] I followed the style guidelines of this project
- [ ] I did a self-review of my code
- [ ] I made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I filled out [the contributor form](https://tally.so/r/n9XrxK)
(see text above)
- [ ] I have added relevant notes to the `CHANGELOG.md` file (See
https://keepachangelog.com/)
@frascuchon
ci: moving argilla-frontend project (#4815)
5228bf3 
<!-- Thanks for your contribution! As part of our Community Growers
initiative 🌱, we're donating Justdiggit bunds in your name to reforest
sub-Saharan Africa. To claim your Community Growers certificate, please
contact David Berenstein in our Slack community or fill in this form
https://tally.so/r/n9XrxK once your PR has been merged. -->

# Description

This PR moves files from `frontend` to `argilla-frontend`

**Type of change**

(Please delete options that are not relevant. Remember to title the PR
according to the type of change)

- [ ] New feature (non-breaking change which adds functionality)
- [ ] Refactor (change restructuring the codebase without changing
functionality)
- [ ] Improvement (change adding some improvement to an existing
functionality)

**How Has This Been Tested**

(Please describe the tests that you ran to verify your changes. And
ideally, reference `tests`)

- [ ] Test A
- [ ] Test B

**Checklist**

- [ ] I added relevant documentation
- [ ] I followed the style guidelines of this project
- [ ] I did a self-review of my code
- [ ] I made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I filled out [the contributor form](https://tally.so/r/n9XrxK)
(see text above)
- [ ] I have added relevant notes to the `CHANGELOG.md` file (See
https://keepachangelog.com/)
@jfcalvo
ci: add argilla-server project (#4824)
ab5f790 
# Description

Add `argilla-server` to his own folder using code from
argilla-io/argilla-server#168

The following code has been removed/changed:
* Folder `/.github` has not been copied from `argilla-server`.
* Submodule `argilla` has not been copied from `argilla-server`.

**Type of change**

(Please delete options that are not relevant. Remember to title the PR
according to the type of change)

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [x] Refactor (change restructuring the codebase without changing
functionality)
- [ ] Improvement (change adding some improvement to an existing
functionality)
- [ ] Documentation update

**How Has This Been Tested**

- [ ] Build should be successfully created.

**Checklist**

- [ ] I added relevant documentation
- [ ] follows the style guidelines of this project
- [ ] I did a self-review of my code
- [ ] I made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I filled out [the contributor form](https://tally.so/r/n9XrxK)
(see text above)
- [ ] I have added relevant notes to the CHANGELOG.md file (See
https://keepachangelog.com/)
@frascuchon frascuchon added this to the v1.29.0 milestone May 14, 2024
@frascuchon frascuchon changed the title ci: Prepare mono repo setup ci: Mono repo setup May 14, 2024
jfcalvo and others added 9 commits May 14, 2024 11:36
@jfcalvo
ci: check argilla actions using argilla-server (#4826)
05f8693 
# Description

We will use this PR to check that GitHub Actions are working as expected
for `argilla` folder, integrated with new `argilla-server` project.

**Type of change**

(Please delete options that are not relevant. Remember to title the PR
according to the type of change)

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] Refactor (change restructuring the codebase without changing
functionality)
- [ ] Improvement (change adding some improvement to an existing
functionality)
- [ ] Documentation update

**How Has This Been Tested**

(Please describe the tests that you ran to verify your changes. And
ideally, reference `tests`)

- [ ] Test A
- [ ] Test B

**Checklist**

- [ ] I added relevant documentation
- [ ] follows the style guidelines of this project
- [ ] I did a self-review of my code
- [ ] I made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I filled out [the contributor form](https://tally.so/r/n9XrxK)
(see text above)
- [ ] I have added relevant notes to the CHANGELOG.md file (See
https://keepachangelog.com/)
@frascuchon
chore: Delete old workflows
c7b0f00
@frascuchon
Merge branch 'develop' into ci/configure-mono-repo
9866a6f
@frascuchon @jfcalvo
chore: move deployment setup to examples (#4830)
0ce7f5e 
<!-- Thanks for your contribution! As part of our Community Growers
initiative 🌱, we're donating Justdiggit bunds in your name to reforest
sub-Saharan Africa. To claim your Community Growers certificate, please
contact David Berenstein in our Slack community or fill in this form
https://tally.so/r/n9XrxK once your PR has been merged. -->

# Description

This PR moves files related to deployment setup into an
`examples/deployments` folder.

**Type of change**

(Please delete options that are not relevant. Remember to title the PR
according to the type of change)

- [ ] New feature (non-breaking change which adds functionality)
- [ ] Refactor (change restructuring the codebase without changing
functionality)
- [x] Improvement (change adding some improvement to an existing
functionality)

**How Has This Been Tested**

(Please describe the tests that you ran to verify your changes. And
ideally, reference `tests`)

- [ ] Test A
- [ ] Test B

**Checklist**

- [ ] I added relevant documentation
- [ ] I followed the style guidelines of this project
- [ ] I did a self-review of my code
- [ ] I made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I filled out [the contributor form](https://tally.so/r/n9XrxK)
(see text above)
- [ ] I have added relevant notes to the `CHANGELOG.md` file (See
https://keepachangelog.com/)

---------

Co-authored-by: José Francisco Calvo <jose@argilla.io>
@frascuchon
Merge branch 'develop' into ci/configure-mono-repo
5f60407
@frascuchon
Merge branch 'ci/configure-mono-repo' of github.com:argilla-io/argill…
0e90a66 
…a into ci/configure-mono-repo
@frascuchon @nataliaElv @pre-commit-ci
docs: Review Developer docs (#4776)
746c516 
<!-- Thanks for your contribution! As part of our Community Growers
initiative 🌱, we're donating Justdiggit bunds in your name to reforest
sub-Saharan Africa. To claim your Community Growers certificate, please
contact David Berenstein in our Slack community or fill in this form
https://tally.so/r/n9XrxK once your PR has been merged. -->

# Description

This PR reviews the development docs related to this new mono repo
structure. I realized that some of those docs were outdated. These docs
will be revisited in future PRs.

**Type of change**

(Remember to title the PR according to the type of change)

- [ ] Documentation update

**How Has This Been Tested**

(Please describe the tests that you ran to verify your changes.)

- [ ] `sphinx-autobuild` (read [Developer
Documentation](https://docs.argilla.io/en/latest/community/developer_docs.html#building-the-documentation)
for more details)

**Checklist**

- [ ] I added relevant documentation
- [ ] I followed the style guidelines of this project
- [ ] I did a self-review of my code
- [ ] I made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I filled out [the contributor form](https://tally.so/r/n9XrxK)
(see text above)
- [ ] I have added relevant notes to the `CHANGELOG.md` file (See
https://keepachangelog.com/)

---------

Co-authored-by: Natalia Elvira <126158523+nataliaElv@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@jfcalvo
chore: upgrade argilla-frontend folder with latests changes from fron…
7e7ff96 
…tend folder at develop branch
@jfcalvo
Merge branch 'develop' into ci/configure-mono-repo
78c2363
@jfcalvo
Copy link
Member

jfcalvo commented May 16, 2024

@damianpumar @leiyre can you take a look to the commit 7e7ff96 updating argilla-frontend folder with the latests changes from develop before merging the PR?

@jfcalvo jfcalvo merged commit 66bebda into develop May 16, 2024
5 checks passed
@jfcalvo jfcalvo deleted the ci/configure-mono-repo branch May 16, 2024 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jfcalvo jfcalvo jfcalvo left review comments

@damianpumar damianpumar Awaiting requested review from damianpumar

@burtenshaw burtenshaw Awaiting requested review from burtenshaw

@davidberenstein1957 davidberenstein1957 Awaiting requested review from davidberenstein1957

Assignees
No one assigned
Labels
area: ci Indicates that an issue or pull request is related to the Continuous Integration (CI) size:XL This PR changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.29.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@frascuchon @jfcalvo