From fa5f44a6e5c599deddc05aeb65aec3a895d3af5f Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 29 Jul 2025 13:35:01 -0300 Subject: [PATCH 01/17] ci(legal): add cla bot (#320) * ci(legal): add cla bot Signed-off-by: Carlos Alexandro Becker * chore(legal): add CLA --------- Signed-off-by: Carlos Alexandro Becker Co-authored-by: Christian Rocha --- .github/workflows/cla.yml | 35 +++++++++++++++++++++++++++++++++++ CLA.md | 18 ++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .github/workflows/cla.yml create mode 100644 CLA.md diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml new file mode 100644 index 0000000000000000000000000000000000000000..6314fd66da2a1d626049ee646d9f93f8e23d19e5 --- /dev/null +++ b/.github/workflows/cla.yml @@ -0,0 +1,35 @@ +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: + if: github.repository == 'charmbracelet/crush' + runs-on: ubuntu-latest + steps: + - name: "CLA Assistant" + if: | + github.event.comment.body == 'recheck' || + github.event.comment.body == 'I have read the Contributor License Agreement (CLA) and hereby sign the CLA.' || + github.event_name == 'pull_request_target' + uses: contributor-assistant/github-action@v2.6.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + path-to-signatures: ".github/cla-signatures.json" + path-to-document: "https://github.com/charmbracelet/crush/blob/main/CLA.md" # TODO: provide the CLA.md file (Christian) + branch: "main" # WARN: if we make `main` protected, this will start failing + allowlist: dependabot[bot] + custom-pr-sign-comment: "I have read the Contributor License Agreement (CLA) and hereby sign the CLA." + lock-pullrequest-aftermerge: false + signed-commit-message: "chore(legal): @$contributorName has signed the CLA in $owner/$repo#$pullRequestNo" diff --git a/CLA.md b/CLA.md new file mode 100644 index 0000000000000000000000000000000000000000..1009ed94ab3ce9e91c9fdb0a1cb3f6e4c299945a --- /dev/null +++ b/CLA.md @@ -0,0 +1,18 @@ +# Contributor License Agreement + +Thank you for your interest in the open source project(s) managed by Charmbracelet, Inc. ("Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, Company must have a Contributor License Agreement ("CLA") on file that has been signed by each contributor, indicating agreement to the license terms below. This license is for your protection as a contributor as well as the protection of Company and its other contributors and users; it does not change your rights to use your own Contributions for any other purpose. +By submitting a contribution to this repository (e.g. opening a pull request) or otherwise agreeing in writing, You accept and agree to these terms and conditions for Your present and future Contributions submitted to Company. In return, Company shall consider Your Contributions for addition to the official Company open source project(s) for which they were submitted. Except for the license granted herein to Company and recipients of software distributed by Company, You reserve all right, title, and interest in and to Your Contributions. + +1. Definitions. + - "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is entering into this CLA with Company. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + - "Contribution" shall mean any code, documentation or other original works of authorship, including any modifications or additions to an existing work, that are intentionally submitted by You to Company for inclusion in, or documentation of, any of the products owned or managed by Company (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Company or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Company for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." +2. Grant of Copyright License. Subject to the terms and conditions of this CLA, You hereby grant to Company and to recipients of software distributed by Company a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. +3. Grant of Patent License. Subject to the terms and conditions of this CLA, You hereby grant to Company and to recipients of software distributed by Company a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) were submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this CLA for that Contribution or Work shall terminate as of the date such litigation is filed. +4. You represent and warrant that You are legally entitled to grant the above license. If You are an individual and Your employer(s) has rights to intellectual property that You create that includes Your Contributions, You represent that You have received permission to make Contributions on behalf of that employer, that Your employer has waived such rights for Your Contributions to Company, or that Your employer has entered into a separate CLA with Company covering Your Contributions. If You are a company, You represent further that each employee making a Contribution to Company under the company’s name is authorized to submit Contributions on behalf of the company. +5. You represent and warrant that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent and warrant that, to Your knowledge, none of Your Contributions infringe, violate, or misappropriate any third party intellectual property or other proprietary rights. +6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, except for the warranties set forth above, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. +7. Should You wish to submit work that is not Your original creation, You may submit it to Company separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]". +8. You agree to notify Company of any facts or circumstances of which You become aware that would make the above representations and warranties inaccurate in any respect. +9. If You are entering into this CLA as a company, You represent and warrant that the individual accepting this CLA is duly authorized to enter into this CLA on the company’s behalf. + +For any copyright notices or other communications, please contact us at [vt100@charm.land](mailto:vt100@charm.land). From 1d176206918cd44567f1141943d25da35167c4c4 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 29 Jul 2025 13:39:53 -0300 Subject: [PATCH 02/17] ci: fix token perms --- .github/workflows/schema-update.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/schema-update.yml b/.github/workflows/schema-update.yml index 4694981718b98b7d651b56f4be9edd63393d9e4c..e4c43b9d0ac87804c685ee5ebdc173c46f426840 100644 --- a/.github/workflows/schema-update.yml +++ b/.github/workflows/schema-update.yml @@ -8,6 +8,8 @@ on: jobs: update-schema: + permissions: + contents: write runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From e353687e37f4aa5c90ef15b2f0a774249f0e4e4f Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 29 Jul 2025 13:52:47 -0300 Subject: [PATCH 03/17] ci: bot PAT --- .github/workflows/schema-update.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/schema-update.yml b/.github/workflows/schema-update.yml index e4c43b9d0ac87804c685ee5ebdc173c46f426840..83adff3e13c631630cd79726054d0b6c4541624d 100644 --- a/.github/workflows/schema-update.yml +++ b/.github/workflows/schema-update.yml @@ -8,13 +8,11 @@ on: jobs: update-schema: - permissions: - contents: write runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.CRUSH_CLA_BOT }} - uses: actions/setup-go@v5 with: go-version-file: go.mod From 8fd27f2b45b5e5902bf92d118ec83178a05674c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Jul 2025 16:58:08 +0000 Subject: [PATCH 04/17] Creating file for storing CLA Signatures --- .github/cla-signatures.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/cla-signatures.json diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json new file mode 100644 index 0000000000000000000000000000000000000000..18d5487f322fe84049529e80586b65554b2de303 --- /dev/null +++ b/.github/cla-signatures.json @@ -0,0 +1,3 @@ +{ + "signedContributors": [] +} \ No newline at end of file From b992dff7701c24055e63e4815776100af27c6ba6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Jul 2025 16:58:30 +0000 Subject: [PATCH 05/17] chore(legal): @caarlos0 has signed the CLA in charmbracelet/crush#$pullRequestNo --- .github/cla-signatures.json | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json index 18d5487f322fe84049529e80586b65554b2de303..dff87e05009178e96c218e517f3abc1cd3f714a3 100644 --- a/.github/cla-signatures.json +++ b/.github/cla-signatures.json @@ -1,3 +1,28 @@ { - "signedContributors": [] + "signedContributors": [ + { + "name": "caarlos0", + "id": 245435, + "comment_id": 3133262377, + "created_at": "2025-07-29T16:36:11Z", + "repoId": 987670088, + "pullRequestNo": 331 + }, + { + "name": "caarlos0", + "id": 245435, + "comment_id": 3133278310, + "created_at": "2025-07-29T16:41:01Z", + "repoId": 987670088, + "pullRequestNo": 331 + }, + { + "name": "caarlos0", + "id": 245435, + "comment_id": 3133337608, + "created_at": "2025-07-29T16:57:59Z", + "repoId": 987670088, + "pullRequestNo": 331 + } + ] } \ No newline at end of file From 67bffd7815d875df11c177a53e4335e719161310 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 29 Jul 2025 14:02:14 -0300 Subject: [PATCH 06/17] chore(legal): fix signatures Signed-off-by: Carlos Alexandro Becker --- .github/cla-signatures.json | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json index dff87e05009178e96c218e517f3abc1cd3f714a3..bfc0355adeaac91bec3e7703a1db7d7bee872280 100644 --- a/.github/cla-signatures.json +++ b/.github/cla-signatures.json @@ -7,22 +7,6 @@ "created_at": "2025-07-29T16:36:11Z", "repoId": 987670088, "pullRequestNo": 331 - }, - { - "name": "caarlos0", - "id": 245435, - "comment_id": 3133278310, - "created_at": "2025-07-29T16:41:01Z", - "repoId": 987670088, - "pullRequestNo": 331 - }, - { - "name": "caarlos0", - "id": 245435, - "comment_id": 3133337608, - "created_at": "2025-07-29T16:57:59Z", - "repoId": 987670088, - "pullRequestNo": 331 } ] -} \ No newline at end of file +} From 874ca8e58db1aae8257ca25574270d3a42f893f3 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 29 Jul 2025 14:05:08 -0300 Subject: [PATCH 07/17] chore(legal): fix cla job Signed-off-by: Carlos Alexandro Becker --- .github/workflows/cla.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 6314fd66da2a1d626049ee646d9f93f8e23d19e5..c6d2674a806d4fab0f035a591bb4ffef8cea5e9e 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -24,12 +24,12 @@ jobs: github.event_name == 'pull_request_target' uses: contributor-assistant/github-action@v2.6.1 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.CRUSH_CLA_BOT }} with: path-to-signatures: ".github/cla-signatures.json" - path-to-document: "https://github.com/charmbracelet/crush/blob/main/CLA.md" # TODO: provide the CLA.md file (Christian) - branch: "main" # WARN: if we make `main` protected, this will start failing + path-to-document: "https://github.com/charmbracelet/crush/blob/main/CLA.md" + branch: "main" allowlist: dependabot[bot] custom-pr-sign-comment: "I have read the Contributor License Agreement (CLA) and hereby sign the CLA." lock-pullrequest-aftermerge: false - signed-commit-message: "chore(legal): @$contributorName has signed the CLA in $owner/$repo#$pullRequestNo" + signed-commit-message: "chore(legal): @$contributorName has signed the CLA in $pullRequestNo" From 4e0f38fdbc19f2e1d33b47196ef7fb8bec46920a Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 29 Jul 2025 14:10:46 -0300 Subject: [PATCH 08/17] chore(legal): cla cleanup Signed-off-by: Carlos Alexandro Becker --- .github/cla-signatures.json | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .github/cla-signatures.json diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json deleted file mode 100644 index bfc0355adeaac91bec3e7703a1db7d7bee872280..0000000000000000000000000000000000000000 --- a/.github/cla-signatures.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "signedContributors": [ - { - "name": "caarlos0", - "id": 245435, - "comment_id": 3133262377, - "created_at": "2025-07-29T16:36:11Z", - "repoId": 987670088, - "pullRequestNo": 331 - } - ] -} From d5e5d318288e5600cf6174c37a90b670b33488bc Mon Sep 17 00:00:00 2001 From: Charm <124303983+charmcli@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:11:17 -0300 Subject: [PATCH 09/17] Creating file for storing CLA Signatures --- .github/cla-signatures.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/cla-signatures.json diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json new file mode 100644 index 0000000000000000000000000000000000000000..18d5487f322fe84049529e80586b65554b2de303 --- /dev/null +++ b/.github/cla-signatures.json @@ -0,0 +1,3 @@ +{ + "signedContributors": [] +} \ No newline at end of file From fba5fc44d7f12364b1bf1bb98be2f35129387488 Mon Sep 17 00:00:00 2001 From: Charm <124303983+charmcli@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:12:04 -0300 Subject: [PATCH 10/17] chore(legal): @caarlos0 has signed the CLA in $pullRequestNo --- .github/cla-signatures.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json index 18d5487f322fe84049529e80586b65554b2de303..60fe663398ef6157c89df6326a5f853a24b10a80 100644 --- a/.github/cla-signatures.json +++ b/.github/cla-signatures.json @@ -1,3 +1,12 @@ { - "signedContributors": [] + "signedContributors": [ + { + "name": "caarlos0", + "id": 245435, + "comment_id": 3133376230, + "created_at": "2025-07-29T17:11:51Z", + "repoId": 987670088, + "pullRequestNo": 333 + } + ] } \ No newline at end of file From 38179132875ce6f53208e6939aca497a6591c79e Mon Sep 17 00:00:00 2001 From: Charm <124303983+charmcli@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:13:12 -0300 Subject: [PATCH 11/17] chore(legal): @raphamorim has signed the CLA in $pullRequestNo --- .github/cla-signatures.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json index 60fe663398ef6157c89df6326a5f853a24b10a80..e735b743d61b37aabaa7120446b122eff6b5c1c1 100644 --- a/.github/cla-signatures.json +++ b/.github/cla-signatures.json @@ -7,6 +7,22 @@ "created_at": "2025-07-29T17:11:51Z", "repoId": 987670088, "pullRequestNo": 333 + }, + { + "name": "raphamorim", + "id": 3630346, + "comment_id": 3133374793, + "created_at": "2025-07-29T17:11:19Z", + "repoId": 987670088, + "pullRequestNo": 230 + }, + { + "name": "raphamorim", + "id": 3630346, + "comment_id": 3133379333, + "created_at": "2025-07-29T17:13:00Z", + "repoId": 987670088, + "pullRequestNo": 230 } ] } \ No newline at end of file From f1253abacb9814c9f217507bba1c69c7602506b7 Mon Sep 17 00:00:00 2001 From: Charm <124303983+charmcli@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:19:38 -0300 Subject: [PATCH 12/17] chore(legal): @aymanbagabas has signed the CLA in $pullRequestNo --- .github/cla-signatures.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json index e735b743d61b37aabaa7120446b122eff6b5c1c1..8ff8a08410cfae744c3083aad09072ab75be2f84 100644 --- a/.github/cla-signatures.json +++ b/.github/cla-signatures.json @@ -23,6 +23,22 @@ "created_at": "2025-07-29T17:13:00Z", "repoId": 987670088, "pullRequestNo": 230 + }, + { + "name": "aymanbagabas", + "id": 3187948, + "comment_id": 3133374319, + "created_at": "2025-07-29T17:11:08Z", + "repoId": 987670088, + "pullRequestNo": 224 + }, + { + "name": "aymanbagabas", + "id": 3187948, + "comment_id": 3133398259, + "created_at": "2025-07-29T17:19:30Z", + "repoId": 987670088, + "pullRequestNo": 224 } ] } \ No newline at end of file From 9279e8580d634632c0650fcac91f11490c4ed818 Mon Sep 17 00:00:00 2001 From: Charm <124303983+charmcli@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:21:24 -0300 Subject: [PATCH 13/17] chore(legal): @andreynering has signed the CLA in $pullRequestNo --- .github/cla-signatures.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json index 8ff8a08410cfae744c3083aad09072ab75be2f84..dddf4a97833d68c1e1f74387ba39f44c0dee66c3 100644 --- a/.github/cla-signatures.json +++ b/.github/cla-signatures.json @@ -39,6 +39,14 @@ "created_at": "2025-07-29T17:19:30Z", "repoId": 987670088, "pullRequestNo": 224 + }, + { + "name": "andreynering", + "id": 7011819, + "comment_id": 3133398174, + "created_at": "2025-07-29T17:19:29Z", + "repoId": 987670088, + "pullRequestNo": 323 } ] } \ No newline at end of file From 021b9bc7567745ec53245f66ad5f433d6f07f2a5 Mon Sep 17 00:00:00 2001 From: Charm <124303983+charmcli@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:51:35 -0300 Subject: [PATCH 14/17] chore(legal): @ras0q has signed the CLA in $pullRequestNo --- .github/cla-signatures.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/cla-signatures.json b/.github/cla-signatures.json index dddf4a97833d68c1e1f74387ba39f44c0dee66c3..fa6b7fc12b3ed51172041dacf121c0be46ce3b92 100644 --- a/.github/cla-signatures.json +++ b/.github/cla-signatures.json @@ -47,6 +47,14 @@ "created_at": "2025-07-29T17:19:29Z", "repoId": 987670088, "pullRequestNo": 323 + }, + { + "name": "ras0q", + "id": 66677201, + "comment_id": 3133486409, + "created_at": "2025-07-29T17:51:25Z", + "repoId": 987670088, + "pullRequestNo": 335 } ] } \ No newline at end of file From bcd687ea98d4abb6b268dfb80f988d9c7e696fae Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 29 Jul 2025 15:02:34 -0300 Subject: [PATCH 16/17] ci: fix missing secrets for goreleaser --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38cc2ce2603318c339d50a5e5b412110653ab748..892eca091e6ce3088a9e0de68d278863caf1aa36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,12 @@ jobs: goreleaser: uses: charmbracelet/meta/.github/workflows/goreleaser.yml@main secrets: + docker_username: ${{ secrets.DOCKERHUB_USERNAME }} + docker_token: ${{ secrets.DOCKERHUB_TOKEN }} gh_pat: ${{ secrets.PERSONAL_ACCESS_TOKEN }} goreleaser_key: ${{ secrets.GORELEASER_KEY }} fury_token: ${{ secrets.FURY_TOKEN }} nfpm_gpg_key: ${{ secrets.NFPM_GPG_KEY }} nfpm_passphrase: ${{ secrets.NFPM_PASSPHRASE }} npm_token: ${{ secrets.NPM_TOKEN }} + snapcraft_token: ${{ secrets.SNAPCRAFT_TOKEN }}