-
-
Notifications
You must be signed in to change notification settings - Fork 59
feat: split tools #71
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| name: Assemble tools.json | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ 'master', 'main' ] | ||
| paths: | ||
| - "tools/*" | ||
| - ".github/workflows/assemble_tools_json.yml" | ||
| workflow_dispatch: | ||
|
|
||
| # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token | ||
| permissions: { } | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| assemble: | ||
| name: assemble tools.json | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v5 | ||
| - name: Set up Python | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: 3.x | ||
| - name: assemble tools.json | ||
| run: helpers/tools-assemble.py | ||
| - name: Upload artifact | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: tools.json | ||
| path: tools.json | ||
|
|
||
| validate: | ||
| needs: | ||
| - assemble | ||
| name: validate tools.json | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v5 | ||
| - name: Set up Python | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: 3.x | ||
| - name: Install check-jsonschema | ||
| run: pip install check-jsonschema | ||
| - name: Download artifact | ||
| uses: actions/download-artifact@v5 | ||
| with: | ||
| name: tools.json | ||
| - name: Validate tools.json | ||
| run: check-jsonschema --schemafile schemas/tools.schema.json tools.json | ||
|
|
||
| push-back: | ||
| needs: | ||
| - assemble | ||
| - validate | ||
| name: push tools.json | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write # needed for git push | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v5 | ||
| with: | ||
| ref: ${{ github.head_ref }} | ||
| - name: Download artifact | ||
| uses: actions/download-artifact@v5 | ||
| with: | ||
| name: tools.json | ||
| - name: diff | ||
| run: git diff tools.json | ||
| - name: Configure Git | ||
| run: | | ||
| git config user.name "github-actions[bot]" | ||
| git config user.email "github-actions[bot]@users.noreply.github.com" | ||
| - name: Commit tools.json | ||
| run: | | ||
| git add tools.json | ||
| git commit -s -m "Update tools.json [automated commit]" || echo "No changes to commit" | ||
| - name: git push back | ||
| run: git push | ||
|
|
||
| publish: | ||
| needs: | ||
| - push-back | ||
| # need to trigger this workflow manually, for the following reason: | ||
| # The "publish" workflow is triggered whenever a `tools.json` is modified - which happens during | ||
| # the `push-back` step. and this commit is issued by a bot. | ||
| # GitHub workflows may triggered on events only if not issues by a bot - so the workflow would | ||
| # not trigger automatically. | ||
| uses: .github/workflows/publish_toolcenter.yml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| name: publish ToolCenter | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ 'master', 'main' ] | ||
| paths: | ||
| - "tools.json" | ||
| - ".github/workflows/publish_toolcenter.yml" | ||
| workflow_dispatch: | ||
|
|
||
| # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token | ||
| permissions: { } | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| trigger_deploy: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Trigger Cloudflare Deploy Hook | ||
| run: curl -X POST "${{ secrets.CLOUDFLARE_DEPLOY_HOOK }}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: Validate each tool | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ 'master', 'main' ] | ||
| paths: | ||
| - "tools/*" | ||
| - "schemas/tool.schema.json" | ||
| - ".github/workflows/validate_tools.yml" | ||
| pull_request: | ||
| paths: | ||
| - "tools/*" | ||
| - "schemas/tool.schema.json" | ||
| - ".github/workflows/validate_tools.yml" | ||
| workflow_dispatch: | ||
|
|
||
| # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token | ||
| permissions: { } | ||
|
|
||
| jobs: | ||
| validate: | ||
| name: validate each tool | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v5 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: 3.x | ||
|
|
||
| - name: Install check-jsonschema | ||
| run: pip install check-jsonschema | ||
|
|
||
| - name: Validate all tools | ||
| run: | | ||
| set -exu | ||
| for tool in tools/*.json | ||
| do | ||
| check-jsonschema --schemafile schemas/tool.schema.json "$tool" | ||
| done |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| #!/usr/bin/env python3 | ||
|
|
||
| from datetime import datetime, timezone | ||
| from json import dump as json_dump, load as json_load | ||
| from pathlib import Path | ||
|
|
||
| REPO_ROOT = Path(__file__).parent.parent | ||
| TOOLS_JSON = REPO_ROOT / 'tools.json' | ||
| TOOLS_FOLDER = REPO_ROOT / 'tools' | ||
|
|
||
| tools = [] | ||
|
|
||
| license_ = { | ||
| 'id': 'CC-BY-SA-4.0', | ||
| 'name': 'Creative Commons Attribution-ShareAlike 4.0 International', | ||
| 'url': 'https://creativecommons.org/licenses/by-sa/4.0/' | ||
| } | ||
|
|
||
| now = datetime.now(timezone.utc).replace(microsecond=0).isoformat().replace('+00:00', 'Z') | ||
|
|
||
| for tfn in sorted(TOOLS_FOLDER.glob('*.json')): | ||
| print('loading', tfn, '...') | ||
| with open(tfn) as t: | ||
| tool = json_load(t) | ||
| tool['tool']['_fromFile'] = tfn.name | ||
| tools.append(tool['tool']) | ||
|
|
||
| print('writing', TOOLS_JSON, '...') | ||
| with open(TOOLS_JSON, 'w') as ts: | ||
| json_dump({ | ||
| '$schema': 'https://cyclonedx.org/schema/tool-center-v2.schema.json', | ||
| 'specVersion': '2.0', | ||
| 'last_updated': now, | ||
| 'license': license_, | ||
| 'tools': tools | ||
| }, ts, indent=2) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
preview:
https://www.metaconfigurator.org?schema=https://raw.githubusercontent.com/CycloneDX/tool-center/refs/heads/feat/devide-tools/schemas/tool.schema.json&settings=https://raw.githubusercontent.com/CycloneDX/tool-center/refs/heads/feat/devide-tools/metaConfiguratorSettings.json