Several changes. Is the GHA still working?
This commit is contained in:
Spirillen
parent
b1fdd6b572
commit
73bebe4f0c
|
|
@ -1,66 +0,0 @@
|
|||
name: Deploy new rules
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "master"
|
||||
pull_request:
|
||||
branches:
|
||||
- "master"
|
||||
schedule:
|
||||
- cron: '01 * * * *'
|
||||
|
||||
env:
|
||||
GIT_NAME: "${{ secrets.GIT_NAME }}"
|
||||
GIT_EMAIL: "${{ secrets.GIT_EMAIL }}"
|
||||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||
|
||||
jobs:
|
||||
buildrules:
|
||||
name: Trigger action
|
||||
runs-on: "${{ matrix.os }}"
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python_version:
|
||||
- "3.9.5"
|
||||
os:
|
||||
- ubuntu-20.04
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
name: Clone repository
|
||||
with:
|
||||
token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
fetch-depth: 5
|
||||
|
||||
- name: Set up Python ${{ matrix.python_version }}
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: ${{ matrix.python_version }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
|
||||
|
||||
- name: Render the rules
|
||||
run: |
|
||||
flrender -v -i ublockorigin-rules=. ublockorigin-rules.template _public/blockrules.txt
|
||||
|
||||
- name: Deploy
|
||||
run: |
|
||||
cd _public
|
||||
git init
|
||||
git add -A
|
||||
git config --local user.email "action@github.com"
|
||||
git config --local user.name "GitHub Action"
|
||||
git commit -m "Release $(git --git-dir ../.git rev-parse --short HEAD)"
|
||||
|
||||
- name: Force push to destination branch
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
branch: gh-pages
|
||||
force: true
|
||||
directory: _public
|
||||
|
|
@ -23,7 +23,7 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
python_version:
|
||||
- "3.9.5"
|
||||
- "3.10"
|
||||
os:
|
||||
- ubuntu-20.04
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ jobs:
|
|||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
|
||||
if [ -f requirements.txt ]; then pip install --no-cache -I -r requirements.txt; fi
|
||||
|
||||
- name: Render the rules
|
||||
run: |
|
||||
|
|
|
|||
30
README.md
30
README.md
|
|
@ -33,11 +33,20 @@ We do not operate at Github do to there anti-privacy terms of usage.
|
|||
|
||||
## File structure
|
||||
|
||||
| File naming | Supported filter types |
|
||||
| :---------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `_domain.` | These filter lists is to ad rules based on a domain specific level. ***IF / WHEN*** a rules is covering more than one domain, you should add it to the corresponding `_rule` filters |
|
||||
| `_rule` | The place for rules covering more than one domain. |
|
||||
|
||||
| File naming | Supported filter types |
|
||||
| :--------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `_domain.` | These filter lists is to ad rules based on a domain specific level. ***IF / WHEN*** a rules is covering more than one domain, you should add it to the corresponding `_rule` filters |
|
||||
| `_rule` | The place for rules covering more than one domain. |
|
||||
| `adult_*.blacklist` | |
|
||||
| `adware_*.blacklist` | |
|
||||
| `annoyance_*.blacklist` | |
|
||||
| `anti_social_*.blacklist` | |
|
||||
| `anti_whitelist_*.blacklist` | |
|
||||
| `cookie_*.blacklist` | |
|
||||
| `noise.txt` | |
|
||||
| `spyware_*.blacklist` | |
|
||||
| `whitelist_*.whitelist` | |
|
||||
| `` | |
|
||||
|
||||
### Sorting filters
|
||||
We are sorting the rules based on the second level domain in the `_domain.`
|
||||
|
|
@ -69,7 +78,7 @@ Howto? [block whitelisted spyware](https://github.com/easylist/easylist/issues/4
|
|||
`$` always needs to exist, if you're going to use a modifier.
|
||||
`,` are used to separate multiple modifier.
|
||||
|
||||
Example (single modifier): ```css $script```
|
||||
Example (single modifier): `$script`
|
||||
Example (multiple modifiers): `$document,frame,script,stylesheet`
|
||||
|
||||
|
||||
|
|
@ -126,9 +135,12 @@ Our HTML front end is <https://my-external-stuff.github.io/ublockorigin-rules/>
|
|||
## Subscribe to the rules
|
||||
[Click here to activate these rules in you uBlock Origin][Subscribe]
|
||||
|
||||
If the above link did not work, try [this one](https://subscribe.adblockplus.org/?location=https://my-external-stuff.github.io/ublockorigin-rules/blockrules.txt&title=Spirillens%20%E2%80%93%20Adblock%20Rules)
|
||||
|
||||
|
||||
## External resources
|
||||
@Yuki2718 [/adblock](https://github.com/Yuki2718/adblock)
|
||||
@Yuki2718 [/adblock](https://github.com/Yuki2718/adblock) (Pretty much
|
||||
all the rules)
|
||||
|
||||
@yourduskquibbles [/webannoyances](https://github.com/yourduskquibbles/webannoyances)
|
||||
|
||||
|
|
@ -138,6 +150,10 @@ Our HTML front end is <https://my-external-stuff.github.io/ublockorigin-rules/>
|
|||
|
||||
@EasyList [easylist.to](https://easylist.to)
|
||||
|
||||
@Spam404 [/Spam404/lists](https://github.com/Spam404/lists)
|
||||
|
||||
@migueldemoura [ublock-umatrix-rulesets](https://github.com/migueldemoura/ublock-umatrix-rulesets/)
|
||||
|
||||
And everyone else I've forgot to mention here.
|
||||
Have a look in the [source list](/ublockorigin-rules.template)
|
||||
|
||||
|
|
|
|||
|
|
@ -32,96 +32,91 @@
|
|||
! Versus any other project I participates to, this is more lazy and
|
||||
! >>If it smells like a fish, it's probably a fish<<
|
||||
!
|
||||
!------- General advert blocking filters ------------------------------!
|
||||
%include ublockorigin-rules:rules/adware_domain.blacklist%
|
||||
%include ublockorigin-rules:rules/adware_rule.blacklist%
|
||||
!------- Advert blocking filters --------------------------------------!
|
||||
%include My-Privacy-DNS-filter:rules/adware_domain.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/adware_rule.blacklist%
|
||||
|
||||
!------- Anti-Social List ---------------------------------------------!
|
||||
%include ublockorigin-rules:rules/anti_social_domain.blacklist%
|
||||
%include ublockorigin-rules:rules/anti_social_rule.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/anti_social_domain.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/anti_social_rule.blacklist%
|
||||
|
||||
!------- SpyWare List -------------------------------------------------!
|
||||
%include ublockorigin-rules:rules/spyware_domain.blacklist%
|
||||
%include ublockorigin-rules:rules/spyware_rule.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/spyware_domain.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/spyware_rule.blacklist%
|
||||
|
||||
!------- White List ---------------------------------------------------!
|
||||
%include ublockorigin-rules:rules/whitelist_domain.whitelist%
|
||||
%include ublockorigin-rules:rules/whitelist_rule.whitelist%
|
||||
%include My-Privacy-DNS-filter:rules/whitelist_domain.whitelist%
|
||||
%include My-Privacy-DNS-filter:rules/whitelist_rule.whitelist%
|
||||
|
||||
!------- Anti White ---------------------------------------------------!
|
||||
%include ublockorigin-rules:rules/anti_whitelist_domain.blacklist%
|
||||
%include ublockorigin-rules:rules/anti_whitelist_rule.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/anti_whitelist_domain.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/anti_whitelist_rule.blacklist%
|
||||
|
||||
!------- Adult Annoyance blocking filters -----------------------------!
|
||||
%include ublockorigin-rules:rules/adult_domain.blacklist%
|
||||
%include ublockorigin-rules:rules/adult_rule.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/adult_domain.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/adult_rule.blacklist%
|
||||
|
||||
!------- Genral Global rules filters ----------------------------------!
|
||||
%include ublockorigin-rules:rules/annoyance_domain.blacklist%
|
||||
%include ublockorigin-rules:rules/annoyance_rule.blacklist%
|
||||
%include ublockorigin-rules:rules/cookie_domain.blacklist%
|
||||
%include ublockorigin-rules:rules/cookie_rule.blacklist%
|
||||
!------- General Global rules filters ---------------------------------!
|
||||
%include My-Privacy-DNS-filter:rules/annoyance_domain.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/annoyance_rule.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/cookie_domain.blacklist%
|
||||
%include My-Privacy-DNS-filter:rules/cookie_rule.blacklist%
|
||||
|
||||
!------- Noise Filters ------------------------------------------------!
|
||||
%include ublockorigin-rules:rules/noise.txt%
|
||||
! %include My-Privacy-DNS-filter:rules/noise.txt%
|
||||
|
||||
!------- Fanboy's Enhanced Tracking List by @ryanbr -------------------!
|
||||
!------- @Yuki2718 many Filters ---------------------------------------!
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/anti-allowlist.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/dynamic-rules.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/dynamic-rules-mob.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/dynamic-rules.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/static-rules.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/no_gen_cosm/phhider-mob.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/no_gen_cosm/phhider.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/adguard/anti-antiadb.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/adguard/social-plus.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/adguard/tracking-plus.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/blog-parts-adult.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/blog-parts.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/blogroll.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-annoyances-plus.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-annoyances.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-filters.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-mob.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-paranoid.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/jp-social.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/mob-app.txt%
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/japanese/sabre-filters2.txt%
|
||||
|
||||
!------- @ryanbr Fanboy's Enhanced Tracking List ----------------------!
|
||||
%include https://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/enhancedstats-addon.txt%
|
||||
|
||||
!------- Easylist Cookie List by @ryanbr ------------------------------!
|
||||
!------- @ryanbr Easylist Cookie List ---------------------------------!
|
||||
%include https://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/fanboy-cookiemonster.txt%
|
||||
|
||||
!------- Anti Whitelist by @Yuki2718 ----------------------------------!
|
||||
%include https://raw.githubusercontent.com/Yuki2718/adblock/master/medium_mode/anti-allowlist.txt%
|
||||
!------- Anti-Facebook List -------------------------------------------!
|
||||
%include https://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/fanboy-antifacebook.txt%
|
||||
|
||||
!------- Fanboy's Annoyance List (@ryanbr) ----------------------------!
|
||||
! %include https://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/fanboy-annoyance.txt%
|
||||
|
||||
!------- webannoyances by @yourduskquibbles ---------------------------!
|
||||
%include https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/ultralist.txt%
|
||||
|
||||
!------- Ad Placeholder by @yourduskquibbles --------------------------!
|
||||
%include https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/filters/ad_placeholders.txt%
|
||||
|
||||
!------- Cookie Filters by @yourduskquibbles --------------------------!
|
||||
%include https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/filters/cookie_filters.txt%
|
||||
|
||||
!------- Floating Annoyances by @yourduskquibbles ---------------------!
|
||||
%include https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/filters/floating_filters.txt%
|
||||
|
||||
!------- Generic Filters by @yourduskquibbles -------------------------!
|
||||
%include https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/filters/generic_filters.txt%
|
||||
|
||||
!------- Modal Overlay by @yourduskquibbles ---------------------------!
|
||||
%include https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/filters/modal_filters.txt%
|
||||
|
||||
!------- Newsletter by @yourduskquibbles ------------------------------!
|
||||
%include https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/filters/newsletter_filters.txt%
|
||||
|
||||
!------- Social Filters by @yourduskquibbles --------------------------!
|
||||
%include https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/filters/social_filters.txt%
|
||||
|
||||
!------- Fuck Fuckadblock by @bogachenko ------------------------------!
|
||||
! %include https://raw.githubusercontent.com/bogachenko/fuckfuckadblock/master/fuckfuckadblock.txt%
|
||||
! this is clearly NOT TO BE TRUSTED...
|
||||
|
||||
!------- AdGuard Base filter ------------------------------------------!
|
||||
%include https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt%
|
||||
|
||||
!------- AdGuard Tracking Protection filter ---------------------------!
|
||||
%include https://filters.adtidy.org/extension/ublock/filters/3.txt%
|
||||
|
||||
!------- Spam404 ------------------------------------------------------!
|
||||
%include https://raw.githubusercontent.com/Spam404/lists/master/adblock-list.txt%
|
||||
!------- AdGuard Social Media filter ----------------------------------!
|
||||
%include https://filters.adtidy.org/extension/ublock/filters/4.txt%
|
||||
|
||||
!------- AdGuard Annoyances filter ------------------------------------!
|
||||
%include https://filters.adtidy.org/extension/ublock/filters/14.txt%
|
||||
|
||||
!------- AdGuard Social Media filter ----------------------------------!
|
||||
%include https://filters.adtidy.org/extension/ublock/filters/4.txt%
|
||||
|
||||
!------- Anti-Facebook List -------------------------------------------!
|
||||
%include https://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/fanboy-antifacebook.txt%
|
||||
|
||||
!------- Fanboy's Annoyance List (@ryanbr) ----------------------------!
|
||||
! %include https://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/fanboy-annoyance.txt%
|
||||
!------- Spam404 ------------------------------------------------------!
|
||||
%include https://raw.githubusercontent.com/Spam404/lists/master/adblock-list.txt%
|
||||
|
||||
!------- Fanboy's Social Blocking List --------------------------------!
|
||||
!%include https://easylist.to/easylist/fanboy-social.txt%
|
||||
|
|
@ -136,7 +131,8 @@
|
|||
%include https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/legacy.txt%
|
||||
%include https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt%
|
||||
%include https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt%
|
||||
!-- Don't ever include this list. It leads to SpyWare, TrackWare and other PUP's and malware!
|
||||
|
||||
!-- Don't ever include this list. It leads to SpyWare, TrackWare, PUP's and malware!
|
||||
!-- %include https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt% --!
|
||||
|
||||
!------- Dan Pollock --------------------------------------------------!
|
||||
|
|
@ -145,6 +141,5 @@
|
|||
!------- Peter @pgl yoyo.org ------------------------------------------!
|
||||
%include https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext%
|
||||
|
||||
|
||||
!------- @migueldemoura ublock-umatrix-rulesets -----------------------!
|
||||
%include https://raw.githubusercontent.com/migueldemoura/ublock-umatrix-rulesets/master/uBlock/list%
|
||||
|
|
|
|||
Loading…
Reference in New Issue