From 1ce9a90de5489d824946ca2f20a6f54e05be4766 Mon Sep 17 00:00:00 2001 From: Uruk Date: Tue, 10 Oct 2023 01:54:18 +0200 Subject: [PATCH 1/9] Added automation workflow to prevent merge conflicts ``` --- .github/workflows/automation.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/automation.yml diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml new file mode 100644 index 0000000..556bc34 --- /dev/null +++ b/.github/workflows/automation.yml @@ -0,0 +1,20 @@ +name: 'Automation' + +on: + push: + branches: [ master ] + pull_request_target: + types: [ synchronize ] + +jobs: + triage: + name: 'Merge conflict labeling' + runs-on: ubuntu-latest + if: ${{ github.repository == 'tycrek/ass' }} + steps: + - uses: eps1lon/actions-label-merge-conflict@releases/2.x + with: + dirtyLabel: 'merge conflict' + commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' + commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." + repoToken: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file From 36c4217e46811b3cde858af3eb5834be28fd93be Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 12 Oct 2023 01:05:27 -0600 Subject: [PATCH 2/9] docs: remove broken lines-of-code badge --- .github/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/README.md b/.github/README.md index 8080843..3a9d395 100644 --- a/.github/README.md +++ b/.github/README.md @@ -5,7 +5,6 @@ ![GitHub package.json version] ![GitHub license] ![GitHub last commit] -![Lines of code] ![GitHub Repo stars] [![Discord badge]][Discord invite] @@ -26,7 +25,6 @@ ass was designed with developers in mind. If you are a developer & want somethin [GitHub package.json version]: https://img.shields.io/github/package-json/v/tycrek/ass?color=fd842d&style=for-the-badge [GitHub license]: https://img.shields.io/github/license/tycrek/ass?color=FD7C21&style=for-the-badge [GitHub last commit]: https://img.shields.io/github/last-commit/tycrek/ass?color=FD710D&style=for-the-badge -[Lines of code]: https://img.shields.io/tokei/lines/github/tycrek/ass?color=F26602&label=LINES&style=for-the-badge [GitHub Repo stars]: https://img.shields.io/github/stars/tycrek/ass?color=DE5E02&style=for-the-badge [Discord badge]: https://img.shields.io/discord/848274994375294986?label=Support%20server&logo=Discord&logoColor=FFF&style=for-the-badge [Discord invite]: https://discord.gg/wGZYt5fasY From 1414a19f9f4eb247d827d5285e01ce9d8d88e3a6 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 12 Oct 2023 01:06:10 -0600 Subject: [PATCH 3/9] docs: fix colour --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 3a9d395..e877e3e 100644 --- a/.github/README.md +++ b/.github/README.md @@ -25,7 +25,7 @@ ass was designed with developers in mind. If you are a developer & want somethin [GitHub package.json version]: https://img.shields.io/github/package-json/v/tycrek/ass?color=fd842d&style=for-the-badge [GitHub license]: https://img.shields.io/github/license/tycrek/ass?color=FD7C21&style=for-the-badge [GitHub last commit]: https://img.shields.io/github/last-commit/tycrek/ass?color=FD710D&style=for-the-badge -[GitHub Repo stars]: https://img.shields.io/github/stars/tycrek/ass?color=DE5E02&style=for-the-badge +[GitHub Repo stars]: https://img.shields.io/github/stars/tycrek/ass?color=F26602&style=for-the-badge [Discord badge]: https://img.shields.io/discord/848274994375294986?label=Support%20server&logo=Discord&logoColor=FFF&style=for-the-badge [Discord invite]: https://discord.gg/wGZYt5fasY [create their own frontends]: #custom-frontends From d6678bb6b75af22b72542a4c8645d4412717ce4a Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 12 Oct 2023 01:07:11 -0600 Subject: [PATCH 4/9] docs: simplify badge text --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index e877e3e..e55568b 100644 --- a/.github/README.md +++ b/.github/README.md @@ -26,7 +26,7 @@ ass was designed with developers in mind. If you are a developer & want somethin [GitHub license]: https://img.shields.io/github/license/tycrek/ass?color=FD7C21&style=for-the-badge [GitHub last commit]: https://img.shields.io/github/last-commit/tycrek/ass?color=FD710D&style=for-the-badge [GitHub Repo stars]: https://img.shields.io/github/stars/tycrek/ass?color=F26602&style=for-the-badge -[Discord badge]: https://img.shields.io/discord/848274994375294986?label=Support%20server&logo=Discord&logoColor=FFF&style=for-the-badge +[Discord badge]: https://img.shields.io/discord/848274994375294986?label=Discord&logo=Discord&logoColor=FFF&style=for-the-badge [Discord invite]: https://discord.gg/wGZYt5fasY [create their own frontends]: #custom-frontends From 06263637887d9c5da2c7b804966f9b473556fba6 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Thu, 12 Oct 2023 01:07:58 -0600 Subject: [PATCH 5/9] docs: center badges because it look cool --- .github/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index e55568b..1ba200d 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,6 +1,5 @@

ass

-
![GitHub package.json version] ![GitHub license] @@ -8,6 +7,8 @@ ![GitHub Repo stars] [![Discord badge]][Discord invite] + + **ass** is a self-hosted ShareX upload server written in Node.js. I initially started this project purely out of spite. ass aims to be as **unopinionated** as possible, giving users & hosts alike the ability to modify nearly everything. By default, ass comes with a resource viewing page, which includes metadata about the resource as well as a download button & inline viewers for images, videos, & audio. It does **not** have a user dashboard or registration system: **this is intentional!** Developers are free to [create their own frontends] using the languages & tools they are most comfortable with. Writing & using these frontends is fully documented below, in the wiki, & in the source code. From a6d2479c76e93d1e9ea7bf88f7edd8fb3c8d703d Mon Sep 17 00:00:00 2001 From: Gauvino <68083474+Gauvino@users.noreply.github.com> Date: Thu, 12 Oct 2023 23:35:29 +0200 Subject: [PATCH 6/9] Change name and add wf to issue --- .github/workflows/automation.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index 556bc34..2f5828d 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -1,20 +1,22 @@ -name: 'Automation' +name: Merge Conflict Labeler on: push: branches: [ master ] pull_request_target: types: [ synchronize ] + issue_comment: jobs: - triage: + label: name: 'Merge conflict labeling' runs-on: ubuntu-latest if: ${{ github.repository == 'tycrek/ass' }} steps: - uses: eps1lon/actions-label-merge-conflict@releases/2.x + if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}} with: dirtyLabel: 'merge conflict' commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." - repoToken: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file + repoToken: "${{ secrets.GITHUB_TOKEN }}" From 34bc2ec3fba50ae36042580aa7b2955b7080f45b Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Fri, 13 Oct 2023 15:57:56 -0600 Subject: [PATCH 7/9] chore: give me money --- .github/FUNDING.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c0f9c86..9849e55 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1 @@ -patreon: tycrek -custom: ['https://jmoore.dev/donate'] +ko_fi: tycrek From ff47f7c02afe6795bd4a540ef9bedec8ca83c57a Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Fri, 13 Oct 2023 21:54:15 -0600 Subject: [PATCH 8/9] fix: secrets cannot start with `GITHUB_` --- .github/workflows/automation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index 2f5828d..cc0c7f3 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -19,4 +19,4 @@ jobs: dirtyLabel: 'merge conflict' commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." - repoToken: "${{ secrets.GITHUB_TOKEN }}" + repoToken: "${{ secrets.GH_TOKEN }}" From fc9bcb9cba83b0a2424b6c42fa46d02a8049381b Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Fri, 13 Oct 2023 21:56:32 -0600 Subject: [PATCH 9/9] fix: run on all branches --- .github/workflows/automation.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index cc0c7f3..c2d27d8 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -2,10 +2,8 @@ name: Merge Conflict Labeler on: push: - branches: [ master ] pull_request_target: types: [ synchronize ] - issue_comment: jobs: label: