diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 25be1c7649..77d78afef0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,8 @@ -name: Update CDN assets +name: Update CDN assets (hourly) on: - # https://unix.stackexchange.com/questions/519538/how-to-set-cron-job-for-every-5-hours schedule: - - cron: '11 */1 * * *' + - cron: '0 * * * *' workflow_dispatch: jobs: @@ -21,49 +20,58 @@ jobs: exit 1 fi exit 0 - - name: Clone uAssetsCDN + + - name: Checkout repository uses: actions/checkout@v4 + - name: Copy shell script from uAssets run: | TMPDIR="$(mktemp -d)" git clone --depth=1 --single-branch --branch=master https://github.com/uBlockOrigin/uAssets.git "$TMPDIR" - cp -v "$TMPDIR"/tools/need-patch.mjs . - cp -v "$TMPDIR"/tools/make-diffpatch.sh . - cp -v "$TMPDIR"/tools/update-diffpatches.sh . + cp -v "$TMPDIR/tools/need-patch.mjs" . + cp -v "$TMPDIR/tools/make-diffpatch.sh" . + cp -v "$TMPDIR/tools/update-diffpatches.sh" . + - name: Time check run: | UPDATE_PERIOD_IN_HOURS=5 echo "CAN_DO=$(node ./need-patch.mjs delay="$UPDATE_PERIOD_IN_HOURS")" >> $GITHUB_ENV + - name: Generate version string if: ${{ env.CAN_DO == 'yes' }} run: | TAGNAME=$(date -u "+%Y.%-m.%-d.")$(date -u "+%H*60+%M" | bc) echo "TAGNAME=$TAGNAME" >> $GITHUB_ENV echo "Version string is $TAGNAME" + - name: Copy uAssets/filters to uAssetsCDN if: ${{ env.CAN_DO == 'yes' }} run: | TMPDIR="$(mktemp -d)" git clone --depth=1 --single-branch --branch=gh-pages https://github.com/uBlockOrigin/uAssets.git "$TMPDIR" - cp -v "$TMPDIR"/filters/*.txt filters/ - cp -v "$TMPDIR"/thirdparties/*.txt thirdparties/ + cp -v "$TMPDIR/filters/*.txt" filters/ + cp -v "$TMPDIR/thirdparties/*.txt" thirdparties/ + - name: Copy uBlock/assets*.json to uAssetsCDN if: ${{ env.CAN_DO == 'yes' }} run: | TMPDIR="$(mktemp -d)" git clone --depth=1 --single-branch --branch=master https://github.com/gorhill/uBlock.git "$TMPDIR" - cp -v "$TMPDIR"/assets/assets*.json ublock/ + cp -v "$TMPDIR/assets/assets*.json" ublock/ + - name: Create new patch if: ${{ env.CAN_DO == 'yes' }} run: | PATCHES_DIR="patches" ./make-diffpatch.sh "${{ env.TAGNAME }}" "$PATCHES_DIR" + - name: Update existing patches if: ${{ env.CAN_DO == 'yes' }} run: | PATCHES_DIR="patches" FILTER_FILES=$(git ls-files --exclude-standard -- filters/*.min.txt thirdparties/*.txt) ./update-diffpatches.sh "$GITHUB_REPOSITORY" "$PATCHES_DIR" "$FILTER_FILES" + - name: Commit changes, if any if: ${{ env.CAN_DO == 'yes' }} run: | diff --git a/.nojekyll b/.nojekyll deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/README.md b/README.md index 17d41195cf..2f850d59a2 100644 --- a/README.md +++ b/README.md @@ -2,33 +2,38 @@ [![](https://data.jsdelivr.com/v1/package/gh/uBlockOrigin/uAssetsCDN/badge)](https://www.jsdelivr.com/package/gh/uBlockOrigin/uAssetsCDN) -CDN content mirroring uAssets +**CDN content mirroring uAssets** -This site is used as a [Content Delivery Network](https://en.wikipedia.org/wiki/Content_delivery_network) for [uBlock Origin's own filter lists](https://github.com/uBlockOrigin/uAssets/tree/master/filters): +This site serves as a [Content Delivery Network](https://en.wikipedia.org/wiki/Content_delivery_network) for [uBlock Origin's filter lists](https://github.com/uBlockOrigin/uAssets/tree/master/filters): -* [uBlock's `assets.json`](./ublock/assets.json) (internal) -* [uBlock's `assets.dev.json`](./ublock/assets.dev.json) (internal) -* [Bad filter lists](./filters/badlists.txt) (internal) -* uBlock filter lists - * [uBlock filters – Ads](./filters/filters.min.txt) (default) - * [uBlock filters – Privacy](./filters/privacy.min.txt) (default) - * [uBlock filters – Badware risks](./filters/badware.txt) (default) - * [uBlock filters – Quick fixes](./filters/quick-fixes.txt) (default) - * [uBlock filters – Unbreak](./filters/unbreak.txt) (default) - * [uBlock filters – Annoyances](./filters/annoyances.txt) - * [Block Outsider Intrusion into LAN](./filters/lan-block.txt) -* EasyList filter lists - * [EasyList – Ads](./thirdparties/easylist.txt) (default) - * [EasyPrivacy](./thirdparties/easyprivacy.txt) (default) - * EasyList – Annoyances - * [EasyList – Annoyances](./thirdparties/easylist-annoyances.txt) - * [EasyList – Cookie Notices](./thirdparties/easylist-cookies.txt) - * [EasyList – Newsletter Notices](./thirdparties/easylist-newsletters.txt) - * [EasyList – Notifications](./thirdparties/easylist-notifications.txt) - * [EasyList – Social Widgets](./thirdparties/easylist-social.txt) +### Internal Files +- [uBlock's `assets.json`](./ublock/assets.json) +- [uBlock's `assets.dev.json`](./ublock/assets.dev.json) +- [Bad filter lists](./filters/badlists.txt) -Mirrors: -- -- -- -- +### uBlock Filter Lists +- **Default** + - [Ads](./filters/filters.min.txt) + - [Privacy](./filters/privacy.min.txt) + - [Badware risks](./filters/badware.txt) + - [Quick fixes](./filters/quick-fixes.txt) + - [Unbreak](./filters/unbreak.txt) +- [Annoyances](./filters/annoyances.txt) +- [Block Outsider Intrusion into LAN](./filters/lan-block.txt) + +### EasyList Filter Lists +- **Default** + - [Ads](./thirdparties/easylist.txt) + - [EasyPrivacy](./thirdparties/easyprivacy.txt) +- **Annoyances** + - [EasyList – Annoyances](./thirdparties/easylist-annoyances.txt) + - [EasyList – Cookie Notices](./thirdparties/easylist-cookies.txt) + - [EasyList – Newsletter Notices](./thirdparties/easylist-newsletters.txt) + - [EasyList – Notifications](./thirdparties/easylist-notifications.txt) + - [EasyList – Social Widgets](./thirdparties/easylist-social.txt) + +### Mirrors +- [uAssetsCDN Homepage](https://ublockorigin.github.io/uAssetsCDN/) +- [uBlock Origin Pages](https://ublockorigin.pages.dev/) +- [jsDelivr Package](https://www.jsdelivr.com/package/gh/uBlockOrigin/uAssetsCDN) +- [Statically CDN](https://statically.io/) diff --git a/index.html b/index.html index ffe4c53ed2..ad4c15f337 100644 --- a/index.html +++ b/index.html @@ -1,43 +1,46 @@ - + - - - + + + uAssetsCDN - -

uAssetsCDN

-

CDN content mirroring uAssets.

-

This site is used as a Content Delivery Network for uBlock Origin's own filter lists:

-