Skip to content

Commit 66e9fe8

Browse files
committed
Revert "Rewrite readme and fix workflows (#25811)"
This reverts commit 62aad26.
1 parent 5f905fe commit 66e9fe8

25 files changed

Lines changed: 199 additions & 195 deletions

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
description: |
1111
**IMPORTANT:** Answer carefully and truthfully.
1212
options:
13-
- 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**_.
13+
- 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**_.
1414
required: true
1515
- label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
1616
required: true

‎.github/ISSUE_TEMPLATE/report_from_ubo.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ description: "DO NOT MANUALLY SELECT THIS TEMPLATE. It's used by uBlock Origin (
33
body:
44
- type: markdown
55
attributes:
6-
value: >
7-
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.
6+
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.
87
- type: checkboxes
98
attributes:
109
label: Prerequisites
1110
description: |
1211
**IMPORTANT:** Answer carefully and truthfully.
1312
options:
14-
- 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**_.
13+
- 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**_.
1514
required: true
1615
- label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
1716
required: true
@@ -33,6 +32,7 @@ body:
3332
required: true
3433
- label: I did not answer truthfully to **ALL** the above checkboxes.
3534
required: false
35+
3636
- type: textarea
3737
attributes:
3838
label: URL(s) where the issue occurs.
@@ -46,18 +46,21 @@ body:
4646
render: yaml
4747
validations:
4848
required: true
49+
4950
- type: textarea
5051
attributes:
5152
label: Description
5253
description: Provide a clear and concise description of the issue.
5354
validations:
5455
required: true
56+
5557
- type: textarea
5658
attributes:
5759
label: Other extensions used
5860
description: List other extensions you are using along uBO (write _none_ if no other extensions). This information helps volunteers investigate issues.
5961
validations:
6062
required: true
63+
6164
- type: textarea
6265
attributes:
6366
label: Screenshot(s)
@@ -71,16 +74,18 @@ body:
7174
<!-- Drag-and-drop screenshot here -->
7275
<!-- ⬇️ ⬇️ ⬇️ -->
7376
77+
7478
<!-- ⬆️ ⬆️ ⬆️ -->
7579
7680
</details>
7781
validations:
7882
required: false
83+
7984
- type: textarea
8085
id: configuration
8186
attributes:
8287
label: Configuration
8388
description: |
84-
Auto-filled by uBO, don't change.
89+
If this section gets automatically filled by uBO, leave it alone.
8590
validations:
8691
required: true

‎.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ description: "DO NOT MANUALLY SELECT THIS TEMPLATE. It's used by uBlock Origin (
33
body:
44
- type: markdown
55
attributes:
6-
value: >
7-
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.
6+
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.
87
- type: checkboxes
98
attributes:
109
label: Prerequisites
1110
description: |
1211
**IMPORTANT:** Answer carefully and truthfully.
1312
options:
14-
- 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**_.
13+
- 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**_.
1514
required: true
1615
- label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
1716
required: true
@@ -33,34 +32,39 @@ body:
3332
required: true
3433
- label: I did not answer truthfully to **ALL** the above checkboxes.
3534
required: false
35+
3636
- type: textarea
3737
id: url_address_of_the_web_page
3838
attributes:
3939
label: URL address of the web page
4040
description: |
41-
Auto-filled by uBO, don't change.
41+
Auto-filled by uBO, leave it alone.
4242
validations:
4343
required: true
44+
4445
- type: textarea
4546
id: category
4647
attributes:
4748
label: Category
4849
description: |
49-
Auto-filled by uBO, don't change.
50+
Auto-filled by uBO, leave it alone.
5051
validations:
5152
required: true
53+
5254
- type: textarea
5355
attributes:
5456
label: Description
5557
description: Provide a clear and concise description of the issue.
5658
validations:
5759
required: true
60+
5861
- type: textarea
5962
attributes:
6063
label: Other extensions used
6164
description: List other extensions you are using along uBO (write _none_ if no other extensions). This information helps volunteers investigate issues.
6265
validations:
6366
required: true
67+
6468
- type: textarea
6569
attributes:
6670
label: Screenshot(s)
@@ -74,16 +78,18 @@ body:
7478
<!-- Drag-and-drop screenshot here -->
7579
<!-- ⬇️ ⬇️ ⬇️ -->
7680
81+
7782
<!-- ⬆️ ⬆️ ⬆️ -->
7883
7984
</details>
8085
validations:
8186
required: false
87+
8288
- type: textarea
8389
id: configuration
8490
attributes:
8591
label: Configuration
8692
description: |
87-
Auto-filled by uBO, don't change.
93+
Auto-filled by uBO, leave it alone.
8894
validations:
8995
required: true

‎.github/ISSUE_TEMPLATE/specific_report_from_ubol.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ labels: ["uBOL"]
44
body:
55
- type: markdown
66
attributes:
7-
value: |
8-
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.
7+
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.
98
- type: checkboxes
109
attributes:
1110
label: Prerequisites
1211
description: |
1312
**IMPORTANT:** Answer carefully and truthfully.
1413
options:
15-
- 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**_.
14+
- 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**_.
1615
required: true
1716
- label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets).
1817
required: true
@@ -36,7 +35,7 @@ body:
3635
attributes:
3736
label: URL address of the web page
3837
description: |
39-
Auto-filled by uBOL, don't change.
38+
Auto-filled by uBOL, leave it alone.
4039
validations:
4140
required: true
4241

@@ -45,7 +44,7 @@ body:
4544
attributes:
4645
label: Category
4746
description: |
48-
Auto-filled by uBOL, don't change.
47+
Auto-filled by uBOL, leave it alone.
4948
validations:
5049
required: true
5150

@@ -76,7 +75,9 @@ body:
7675
<!-- Drag-and-drop screenshot here -->
7776
<!-- ⬇️ ⬇️ ⬇️ -->
7877
78+
7979
<!-- ⬆️ ⬆️ ⬆️ -->
80+
8081
</details>
8182
validations:
8283
required: false
@@ -86,6 +87,6 @@ body:
8687
attributes:
8788
label: Configuration
8889
description: |
89-
Auto-filled by uBOL, don't change.
90+
Auto-filled by uBOL, leave it alone.
9091
validations:
9192
required: true

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
### URL(s) where the issue occurs
44

5-
`[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.]`
5+
`[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.]`
66

77
### Describe the issue
88

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

1111
### Screenshot(s)
1212

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

1515
### Versions
1616

@@ -19,8 +19,8 @@
1919

2020
### Settings
2121

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

2424
### Notes
2525

26-
[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.]
26+
[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.]
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
name: Delete workflow runs
2-
3-
on:
4-
workflow_dispatch:
5-
1+
name: del-runs-comments
2+
on: workflow_dispatch
63
jobs:
74
runx:
85
runs-on: ubuntu-latest
96
permissions: write-all
10-
117
steps:
12-
- name: Delete workflow runs
13-
uses: christosgalano/delete-gh-workflow-runs@v1
8+
- uses: christosgalano/delete-workflow-runs@v1.0.0
149
with:
1510
owner: uBlockOrigin
1611
repo: uAssets
1712
token: ${{ secrets.GITHUB_TOKEN }}
1813
workflow: on-issue-comment
14+
15+
16+
17+
18+
19+

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
workflow_dispatch:
88

9-
# 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
9+
# 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
1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}
1212
cancel-in-progress: true
@@ -21,11 +21,10 @@ jobs:
2121
name: Publish lists
2222
runs-on: ubuntu-latest
2323
steps:
24-
- name: Checkout repository
24+
- name: Clone uAssets
2525
uses: actions/checkout@v4
2626
with:
27-
ref: gh-pages
28-
27+
ref: gh-pages
2928
- name: Copy filter lists to gh-pages
3029
run: |
3130
TMPDIR=$(mktemp -d)
@@ -36,7 +35,6 @@ jobs:
3635
cp $TMPDIR/filters/*.txt filters/
3736
cp $TMPDIR/thirdparties/easylist/easy*.txt thirdparties/
3837
cp $TMPDIR/dnr/*.json dnr/
39-
4038
- name: Patch last-updated field
4139
run: |
4240
DATE=$(date -Ru)
@@ -48,7 +46,6 @@ jobs:
4846
git checkout -q $f
4947
fi
5048
done
51-
5249
- name: Commit changes (if any)
5350
run: |
5451
if [[ -n $(git diff) ]]; then

‎.github/workflows/on-issue-comment.yml‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,18 @@
1-
name: Delete Bad Comments
2-
1+
name: on-issue-comment
32
on:
4-
workflow_dispatch:
53
issue_comment:
64
types: created
7-
85
jobs:
96
check-if-bad-comment:
10-
name: Delete Bad Comment
7+
name: delete bad comment
118
runs-on: ubuntu-latest
12-
if: >-
13-
(
14-
(contains(github.event.comment.body, 'Download') ||
15-
contains(github.event.comment.body, 'install') ||
16-
contains(github.event.comment.body, 'mediafire') ||
17-
contains(github.event.comment.body, 'changeme')) &&
18-
(contains(github.event.comment.body, 'gcc') ||
19-
contains(github.event.comment.body, 'usx'))
20-
) ||
21-
(
22-
contains(github.event.comment.body, 'install') &&
23-
(contains(github.event.comment.body, 'mediafire') ||
24-
contains(github.event.comment.body, 'gofile'))
25-
)
26-
9+
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') ))
2710
permissions: write-all
28-
2911
steps:
30-
- name: Echo event comment body
12+
- name: Delete comment
3113
run: |
32-
echo "${{ github.event.comment.body }}"
33-
34-
- name: Delete comments
35-
uses: actions-cool/issues-helper@v3
14+
echo " ${{ github.event.comment.body }} "
15+
- uses: actions-cool/issues-helper@v3
3616
with:
3717
actions: 'delete-comment'
3818
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/on-youtube-issue.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: Triage YouTube issues
22

33
on:
4-
workflow_dispatch:
54
issues:
6-
types: [opened]
5+
types: opened
76

87
jobs:
98
check-if-youtube:
@@ -12,14 +11,12 @@ jobs:
1211
if: contains(github.event.issue.title, 'youtube.com:')
1312
permissions:
1413
issues: write
15-
1614
steps:
1715
- name: Add label
1816
uses: actions-cool/issues-helper@v3
1917
with:
2018
actions: 'add-labels'
2119
labels: 'duplicate'
22-
2320
- name: Add comment
2421
uses: actions-cool/issues-helper@v3
2522
with:
@@ -28,7 +25,6 @@ jobs:
2825
Please respect what is asked in the issue template to not unduly burden volunteers.
2926
3027
This is a `youtube.com` issue, see <https://github.com/uBlockOrigin/uAssets/issues/20586>.
31-
3228
- name: Close issue
3329
uses: actions-cool/issues-helper@v3
3430
with:

0 commit comments

Comments
 (0)