Skip to content

Commit

Permalink
Merge branch 'main' into mock/tests
Browse files Browse the repository at this point in the history
  • Loading branch information
twlite authored Nov 16, 2024
2 parents 7ce68ab + 580a93c commit 5319d1b
Show file tree
Hide file tree
Showing 5 changed files with 650 additions and 1,015 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: 'CLA Assistant'
on:
issue_comment:
types: [created]
pull_request_target:
types: [opened, closed, synchronize]

permissions:
actions: write
contents: write
pull-requests: write
statuses: write

jobs:
CLAAssistant:
runs-on: ubuntu-latest
steps:
- name: 'CLA Assistant'
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
uses: contributor-assistant/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
path-to-signatures: 'signatures/v1/cla.json'
path-to-document: 'https://github.com/yasumu-org/yasumu/blob/main/CLA.md'
branch: 'main'
allowlist: user1,bot*
38 changes: 38 additions & 0 deletions CLA.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Contributor License Agreement (CLA)

Thank you for your interest in contributing to the Yasumu project. To safeguard the interests of the Yasumu project, its contributors, and its users, we require all contributors to accept the terms of this Contributor License Agreement (CLA) before any contributions can be merged or incorporated into the project.

The following terms apply to this Agreement:

- **"You"** refers to the individual or legal entity making a Contribution to Yasumu.
- **"Yasumu"** refers collectively to the Yasumu project, its maintainers, and any associated entities, including any current or future commercial or non-commercial entity managing or deriving from the project.
- **"Contribution"** refers to any software, code, documentation, design, or other materials submitted by You to Yasumu, whether as an addition, modification, or improvement to the project.
- **"Work"** refers to the entirety of the Yasumu project, including all past, present, and future contributions from all contributors.

## 1. Grant of Copyright License

By making a Contribution, You hereby grant Yasumu, its maintainers, and recipients of the Work a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license to:

- Reproduce, modify, and prepare derivative works of Your Contribution.
- Publicly display and publicly perform Your Contribution.
- Distribute and sublicense Your Contribution and derivative works.

This license applies to both the open-source version of Yasumu and any associated commercial versions. You retain all other rights, title, and interest in Your Contribution unless explicitly stated otherwise in this Agreement.

## 2. Grant of Patent License

By making a Contribution, You hereby grant Yasumu, its maintainers, and recipients of the Work a perpetual, worldwide, non-exclusive, royalty-free, irrevocable (except as stated in this section) license under any patent claims You own or control that are necessarily infringed by:

- Your Contribution alone.
- The combination of Your Contribution with the Work as it existed at the time of your Contribution.

This license includes the right to make, have made, use, sell, offer to sell, import, and otherwise transfer the Work. If You or any entity acting on Your behalf initiates patent litigation (including cross-claims or counterclaims) against Yasumu or any recipient of the Work alleging that Your Contribution infringes a patent, all patent licenses granted under this Agreement for that Contribution shall terminate immediately.

## 3. Source and Originality of Contributions

By making a Contribution, You represent and warrant that:

1. **Original Work:** Your Contribution is an original work authored solely by You or, if based on prior work, that prior work is appropriately licensed, and You have the right to contribute it under this Agreement.
2. **Third-Party Content:** If Your Contribution includes materials not authored by You, You have clearly identified those materials and their sources and confirmed their compatibility with the licensing terms of this Agreement.
3. **No Infringement:** To the best of Your knowledge, Your Contribution does not violate any intellectual property rights, including patents, trademarks, or trade secrets, of any third party.
4. **Authority:** If You are contributing on behalf of an organization or entity, You have the necessary authority to bind that entity to the terms of this Agreement.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Once you've made your changes, you're ready to submit a pull request (PR). Follo
4. **Open a Pull Request**
Go to the Yasumu repository on GitHub and open a new pull request. Provide a detailed description of your changes, the problem you're solving, and any additional context that may be helpful.

Once the PR is submitted, it will be reviewed by the maintainers. If any changes are requested, please address them in a timely manner to help get your contribution merged quickly.
Once the PR is submitted, it will be reviewed by the maintainers. If any changes are requested, please address them in a timely manner to help get your contribution merged quickly. You will be prompted to accept our Contributor License Agreement (CLA) before your PR can be merged.

## Additional Resources

Expand Down
20 changes: 20 additions & 0 deletions signatures/v1/cla.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"signedContributors": [
{
"name": "twlite",
"id": 46562212,
"comment_id": 2480483734,
"created_at": "2024-11-16T08:53:29Z",
"repoId": 781045466,
"pullRequestNo": 165
},
{
"name": "vr-varad",
"id": 114755221,
"comment_id": 2480484437,
"created_at": "2024-11-16T08:56:28Z",
"repoId": 781045466,
"pullRequestNo": 163
}
]
}
Loading

0 comments on commit 5319d1b

Please sign in to comment.