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

Restructuration for community content #169

Merged
merged 4 commits into from
Sep 23, 2024
Merged

Restructuration for community content #169

merged 4 commits into from
Sep 23, 2024

Conversation

bebatut
Copy link
Member

@bebatut bebatut commented Sep 6, 2024

Fix #164

  • Restructure the repository content:
    • Move sources (code) to a source folder
    • Move metadata, resources, and subdomains for communities into communities folder where each community has its own subfolder
    • Move results back to the main branch, in the resources folder
  • Reorganize GitHub action workflows
    • Merge weekly workflows into 1 workflow that will open a PR with the changes (to keep the main branch protected)
    • Update other workflows to the new structure

- Move sources (code) to a `source` folder
- Move metadata, resources, and subdomains for communities into communities folder where each community has its own subfolder
- Move results back to the main branch, in the resources folder
- Merge weekly workflows into 1 workflow that wil open a PR with the changes
- Update other workflows to the new structure
Copy link
Collaborator

@paulzierep paulzierep left a comment

Choose a reason for hiding this comment

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

The new structure is good and I think we can merge this for a start and then check small bits later. But the CI needs a fix for the parallel job, I think.

name: Fetch tool stepwise and merge, fetch tutorials and filter the resources for communities
strategy:
max-parallel: 1 #need to run one after another, since otherwise there is a chance, that mulitple jobs want to push to the results branch at the same time (which fails due to merge)
matrix:
Copy link
Collaborator

Choose a reason for hiding this comment

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

This combined WF triggers a subset job, where each repositories*.list is processed individually. The way it's now combined, everything after the merge part does not really make sense ... and the Fetch list of all available servers should probably also not be a part of the matrix subset. I would propose to run the Fetch all tool stepwise in an individual job and store the results as an artifact. Then use the artifact as input for the merge part and have that as another job.

Copy link
Member Author

@bebatut bebatut Sep 16, 2024

Choose a reason for hiding this comment

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

I adapted the CRON workflow to have 3 jobs

  1. For getting the available servers and storing the TSV as artifact
  2. For triggering the subset jobs to fetch tools in parallel and storing the outputs as artifact
  3. For merging the TSV and running the rest

Copy link
Collaborator

@paulzierep paulzierep left a comment

Choose a reason for hiding this comment

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

The CI looks good. Lets try it !

runs-on: ubuntu-20.04
name: Fetch tool stepwise
strategy:
max-parallel: 1 #need to run one after another, since otherwise there is a chance, that mulitple jobs want to push to the results branch at the same time (which fails due to merge)
Copy link
Collaborator

Choose a reason for hiding this comment

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

With this nice new job logic, we can also run all this jobs at the same time.

.github/workflows/fetch_filter_resources.yaml Outdated Show resolved Hide resolved
This was referenced Sep 19, 2024
@paulzierep paulzierep merged commit 4446293 into main Sep 23, 2024
8 checks passed
@bebatut bebatut deleted the restructure branch September 23, 2024 08:49
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.

Restructure codex for community content
2 participants