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

Rewrite readme and fix workflows #25811

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0157ade
Update Del Run Comments CI
permanentdaylightt Oct 25, 2024
ae58d15
Format CI
permanentdaylightt Oct 25, 2024
7b1d5bb
Update Delete Bad Comments CI
permanentdaylightt Oct 25, 2024
647c8f6
Update YouTube issue CO
permanentdaylightt Oct 25, 2024
aeaa327
Update asset updater CI
permanentdaylightt Oct 25, 2024
fb3e799
Make the action run every hour
permanentdaylightt Oct 25, 2024
fbe6b36
Update pr template
permanentdaylightt Oct 25, 2024
453a989
Update bug report template
permanentdaylightt Oct 25, 2024
7920ecd
sure
permanentdaylightt Oct 25, 2024
1b05810
update template
permanentdaylightt Oct 25, 2024
9f8acfe
update ubo template
permanentdaylightt Oct 25, 2024
4798a51
change template
permanentdaylightt Oct 25, 2024
446b8fd
update ub0l template
permanentdaylightt Oct 27, 2024
fe54eb6
Make the workflow run daily
permanentdaylightt Oct 27, 2024
0694fe7
Update link
permanentdaylightt Oct 27, 2024
9510a1f
Update readme
permanentdaylightt Oct 27, 2024
b3bc06a
Update contributing
permanentdaylightt Oct 27, 2024
5aa7044
Update license template
permanentdaylightt Oct 30, 2024
dc84c1f
Update license template
permanentdaylightt Oct 30, 2024
90b4199
Update to latest Node
permanentdaylightt Oct 30, 2024
f7baa08
Update license
permanentdaylightt Oct 30, 2024
abb464f
Update make-diffpatch.sh
permanentdaylightt Oct 30, 2024
8ca2152
Update license
permanentdaylightt Oct 30, 2024
3a2b051
Update make-easylist.sh
permanentdaylightt Oct 30, 2024
d9779b3
Update make-ublock.sh
permanentdaylightt Oct 30, 2024
a54856e
Update make-validate.sh
permanentdaylightt Oct 30, 2024
4222e2f
Update update-3rdparties.sh
permanentdaylightt Oct 30, 2024
f29f1f4
Update update-diffpatches.sh
permanentdaylightt Oct 30, 2024
96c5cd8
Update LICENSE
permanentdaylightt Oct 30, 2024
28d5dfe
add space
permanentdaylightt Oct 31, 2024
3d85105
add few missing things
permanentdaylightt Oct 31, 2024
e77f4cf
also forgot
permanentdaylightt Oct 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body:
description: |
**IMPORTANT:** Answer carefully and truthfully.
options:
- label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
- label: This is **NOT** a [_YouTube_](https://github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
required: true
- label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
required: true
Expand Down
13 changes: 4 additions & 9 deletions .github/ISSUE_TEMPLATE/report_from_ubo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ description: "DO NOT MANUALLY SELECT THIS TEMPLATE. It's used by uBlock Origin (
body:
- type: markdown
attributes:
value: To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template.
value: >
To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template.
- type: checkboxes
attributes:
label: Prerequisites
description: |
**IMPORTANT:** Answer carefully and truthfully.
options:
- label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
- label: This is **NOT** a [_YouTube_](https://github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
required: true
- label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
required: true
Expand All @@ -32,7 +33,6 @@ body:
required: true
- label: I did not answer truthfully to **ALL** the above checkboxes.
required: false

- type: textarea
attributes:
label: URL(s) where the issue occurs.
Expand All @@ -46,21 +46,18 @@ body:
render: yaml
validations:
required: true

- type: textarea
attributes:
label: Description
description: Provide a clear and concise description of the issue.
validations:
required: true

- type: textarea
attributes:
label: Other extensions used
description: List other extensions you are using along uBO (write _none_ if no other extensions). This information helps volunteers investigate issues.
validations:
required: true

- type: textarea
attributes:
label: Screenshot(s)
Expand All @@ -74,18 +71,16 @@ body:
<!-- Drag-and-drop screenshot here -->
<!-- ⬇️ ⬇️ ⬇️ -->


<!-- ⬆️ ⬆️ ⬆️ -->

</details>
validations:
required: false

- type: textarea
id: configuration
attributes:
label: Configuration
description: |
If this section gets automatically filled by uBO, leave it alone.
Auto-filled by uBO, don't change.
validations:
required: true
18 changes: 6 additions & 12 deletions .github/ISSUE_TEMPLATE/specific_report_from_ubo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ description: "DO NOT MANUALLY SELECT THIS TEMPLATE. It's used by uBlock Origin (
body:
- type: markdown
attributes:
value: To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template.
value: >
To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template.
- type: checkboxes
attributes:
label: Prerequisites
description: |
**IMPORTANT:** Answer carefully and truthfully.
options:
- label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
- label: This is **NOT** a [_YouTube_](https://github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
required: true
- label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
required: true
Expand All @@ -32,39 +33,34 @@ body:
required: true
- label: I did not answer truthfully to **ALL** the above checkboxes.
required: false

- type: textarea
id: url_address_of_the_web_page
attributes:
label: URL address of the web page
description: |
Auto-filled by uBO, leave it alone.
Auto-filled by uBO, don't change.
validations:
required: true

- type: textarea
id: category
attributes:
label: Category
description: |
Auto-filled by uBO, leave it alone.
Auto-filled by uBO, don't change.
validations:
required: true

- type: textarea
attributes:
label: Description
description: Provide a clear and concise description of the issue.
validations:
required: true

- type: textarea
attributes:
label: Other extensions used
description: List other extensions you are using along uBO (write _none_ if no other extensions). This information helps volunteers investigate issues.
validations:
required: true

- type: textarea
attributes:
label: Screenshot(s)
Expand All @@ -78,18 +74,16 @@ body:
<!-- Drag-and-drop screenshot here -->
<!-- ⬇️ ⬇️ ⬇️ -->


<!-- ⬆️ ⬆️ ⬆️ -->

</details>
validations:
required: false

- type: textarea
id: configuration
attributes:
label: Configuration
description: |
Auto-filled by uBO, leave it alone.
Auto-filled by uBO, don't change.
validations:
required: true
13 changes: 6 additions & 7 deletions .github/ISSUE_TEMPLATE/specific_report_from_ubol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ labels: ["uBOL"]
body:
- type: markdown
attributes:
value: To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template.
value: |
To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template.
- type: checkboxes
attributes:
label: Prerequisites
description: |
**IMPORTANT:** Answer carefully and truthfully.
options:
- label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
- label: This is **NOT** a [_YouTube_](https://github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_.
required: true
- label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
required: true
Expand All @@ -35,7 +36,7 @@ body:
attributes:
label: URL address of the web page
description: |
Auto-filled by uBOL, leave it alone.
Auto-filled by uBOL, don't change.
validations:
required: true

Expand All @@ -44,7 +45,7 @@ body:
attributes:
label: Category
description: |
Auto-filled by uBOL, leave it alone.
Auto-filled by uBOL, don't change.
validations:
required: true

Expand Down Expand Up @@ -75,9 +76,7 @@ body:
<!-- Drag-and-drop screenshot here -->
<!-- ⬇️ ⬇️ ⬇️ -->


<!-- ⬆️ ⬆️ ⬆️ -->

</details>
validations:
required: false
Expand All @@ -87,6 +86,6 @@ body:
attributes:
label: Configuration
description: |
Auto-filled by uBOL, leave it alone.
Auto-filled by uBOL, don't change.
validations:
required: true
10 changes: 5 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

### URL(s) where the issue occurs

`[At least one URL for a web page where the clearly described issue occurs is **mandatory**. The backticks surrounding the URLs is important, it prevents the URL from being clickable. Warn with "NSFW" where applicable.]`
`[At least one URL for a web page where the clearly described issue occurs is **mandatory**. The backticks surrounding the URLs is important; it prevents the URL from being clickable. Warn with "NSFW" where applicable.]`

### Describe the issue

[Be as clear as possible: nobody can read mind, and nobody is looking at your issue over your shoulder.]
[Be as clear as possible: nobody can read minds, and nobody is looking at your issue over your shoulder.]

### Screenshot(s)

[Screenshot(s) for difficult to describe visual issues are **mandatory**]
[Screenshot(s) for difficult-to-describe visual issues are **mandatory**.]

### Versions

Expand All @@ -19,8 +19,8 @@

### Settings

- [List here all the changes you made to uBO's default settings]
- [List here all the changes you made to uBO's default settings.]

### Notes

[Add here the result of whatever investigation work you have done: please investigate the issues you report -- this prevents burdening other volunteers. This is especially true for issues arising from settings which are very different from default ones.]
[Add here the result of whatever investigation work you have done: please investigate the issues you reportthis prevents burdening other volunteers. This is especially true for issues arising from settings which are very different from default ones.]
permanentdaylightt marked this conversation as resolved.
Show resolved Hide resolved
17 changes: 8 additions & 9 deletions .github/workflows/del-runs-comments.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
name: del-runs-comments
on: workflow_dispatch
name: Delete workflow runs

on:
workflow_dispatch:

jobs:
runx:
runs-on: ubuntu-latest
permissions: write-all

steps:
- uses: christosgalano/[email protected]
- name: Delete workflow runs
uses: christosgalano/delete-gh-workflow-runs@v1
with:
owner: uBlockOrigin
repo: uAssets
token: ${{ secrets.GITHUB_TOKEN }}
workflow: on-issue-comment






9 changes: 6 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master
workflow_dispatch:

# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
# https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -21,10 +21,11 @@ jobs:
name: Publish lists
runs-on: ubuntu-latest
steps:
- name: Clone uAssets
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: gh-pages
ref: gh-pages

- name: Copy filter lists to gh-pages
run: |
TMPDIR=$(mktemp -d)
Expand All @@ -35,6 +36,7 @@ jobs:
cp $TMPDIR/filters/*.txt filters/
cp $TMPDIR/thirdparties/easylist/easy*.txt thirdparties/
cp $TMPDIR/dnr/*.json dnr/

- name: Patch last-updated field
run: |
DATE=$(date -Ru)
Expand All @@ -46,6 +48,7 @@ jobs:
git checkout -q $f
fi
done

- name: Commit changes (if any)
run: |
if [[ -n $(git diff) ]]; then
Expand Down
32 changes: 26 additions & 6 deletions .github/workflows/on-issue-comment.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,38 @@
name: on-issue-comment
name: Delete Bad Comments

on:
workflow_dispatch:
issue_comment:
types: created

jobs:
check-if-bad-comment:
name: delete bad comment
name: Delete Bad Comment
runs-on: ubuntu-latest
if: (( contains(github.event.comment.body, 'Download') || contains(github.event.comment.body, 'install') || contains(github.event.comment.body, 'mediafire') || contains(github.event.comment.body, 'changeme') ) && ( contains(github.event.comment.body, 'gcc') || contains(github.event.comment.body, 'usx'))) || ( contains(github.event.comment.body, 'install') && ( contains(github.event.comment.body, 'mediafire') || contains(github.event.comment.body, 'gofile') ))
if: >-
(
(contains(github.event.comment.body, 'Download') ||
contains(github.event.comment.body, 'install') ||
contains(github.event.comment.body, 'mediafire') ||
contains(github.event.comment.body, 'changeme')) &&
(contains(github.event.comment.body, 'gcc') ||
contains(github.event.comment.body, 'usx'))
) ||
(
contains(github.event.comment.body, 'install') &&
(contains(github.event.comment.body, 'mediafire') ||
contains(github.event.comment.body, 'gofile'))
)

permissions: write-all

steps:
- name: Delete comment
- name: Echo event comment body
run: |
echo " ${{ github.event.comment.body }} "
- uses: actions-cool/issues-helper@v3
echo "${{ github.event.comment.body }}"

- name: Delete comments
uses: actions-cool/issues-helper@v3
with:
actions: 'delete-comment'
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/on-youtube-issue.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Triage YouTube issues

on:
workflow_dispatch:
issues:
types: opened
types: [opened]

jobs:
check-if-youtube:
Expand All @@ -11,12 +12,14 @@ jobs:
if: contains(github.event.issue.title, 'youtube.com:')
permissions:
issues: write

steps:
- name: Add label
uses: actions-cool/issues-helper@v3
with:
actions: 'add-labels'
labels: 'duplicate'

- name: Add comment
uses: actions-cool/issues-helper@v3
with:
Expand All @@ -25,6 +28,7 @@ jobs:
Please respect what is asked in the issue template to not unduly burden volunteers.

This is a `youtube.com` issue, see <https://github.com/uBlockOrigin/uAssets/issues/20586>.

- name: Close issue
uses: actions-cool/issues-helper@v3
with:
Expand Down
Loading