mirror of
https://github.com/Nezumi-2711/cloudflare-gateway-pihole-scripts.git
synced 2026-09-22 13:38:37 +00:00
updated workflow so it works correctly on the forked repo
This commit is contained in:
@@ -2,65 +2,56 @@ name: Update Filter Lists
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '0 3 * * 1'
|
- cron: "0 3 * * 1"
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- '**'
|
- main
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
cgps:
|
cgps:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Install Node.js
|
- name: Checkout
|
||||||
uses: actions/setup-node@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
|
|
||||||
- name: Clone repository and switch to v1 branch
|
|
||||||
run: |
|
|
||||||
git clone https://github.com/mrrfv/cloudflare-gateway-pihole-scripts.git
|
|
||||||
cd cloudflare-gateway-pihole-scripts
|
|
||||||
git checkout v1
|
|
||||||
|
|
||||||
- name: Install npm dependencies
|
- name: Install Node.js
|
||||||
run: npm ci
|
uses: actions/setup-node@v3
|
||||||
working-directory: cloudflare-gateway-pihole-scripts
|
with:
|
||||||
|
node-version: lts/*
|
||||||
- name: Download recommended whitelist
|
|
||||||
run: bash ./get_recommended_whitelist.sh
|
|
||||||
working-directory: cloudflare-gateway-pihole-scripts
|
|
||||||
|
|
||||||
- name: Download recommended filters
|
|
||||||
run: bash ./get_recommended_filters.sh
|
|
||||||
working-directory: cloudflare-gateway-pihole-scripts
|
|
||||||
|
|
||||||
- name: Delete old rules and lists
|
|
||||||
run: |
|
|
||||||
node cf_gateway_rule_delete.js
|
|
||||||
node cf_list_delete.js
|
|
||||||
working-directory: cloudflare-gateway-pihole-scripts
|
|
||||||
env:
|
|
||||||
CLOUDFLARE_API_KEY: ${{ secrets.CLOUDFLARE_API_KEY }}
|
|
||||||
CLOUDFLARE_ACCOUNT_EMAIL: ${{ secrets.CLOUDFLARE_ACCOUNT_EMAIL }}
|
|
||||||
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
|
||||||
CLOUDFLARE_LIST_ITEM_LIMIT: ${{ secrets.CLOUDFLARE_LIST_ITEM_LIMIT }}
|
|
||||||
|
|
||||||
- name: Create new rules and lists
|
- name: Install npm dependencies
|
||||||
run: |
|
run: npm ci
|
||||||
node cf_list_create.js
|
|
||||||
node cf_gateway_rule_create.js
|
|
||||||
working-directory: cloudflare-gateway-pihole-scripts
|
|
||||||
env:
|
|
||||||
CLOUDFLARE_API_KEY: ${{ secrets.CLOUDFLARE_API_KEY }}
|
|
||||||
CLOUDFLARE_ACCOUNT_EMAIL: ${{ secrets.CLOUDFLARE_ACCOUNT_EMAIL }}
|
|
||||||
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
|
||||||
CLOUDFLARE_LIST_ITEM_LIMIT: ${{ secrets.CLOUDFLARE_LIST_ITEM_LIMIT }}
|
|
||||||
|
|
||||||
- name: Send ping request
|
- name: Download recommended whitelist
|
||||||
if: env.PING_URL != ''
|
run: bash ./get_recommended_whitelist.sh
|
||||||
working-directory: cloudflare-gateway-pihole-scripts
|
|
||||||
env:
|
- name: Download recommended filters
|
||||||
PING_URL: ${{ secrets.PING_URL }}
|
run: bash ./get_recommended_filters.sh
|
||||||
run: |
|
|
||||||
curl "${{ env.PING_URL }}"
|
- name: Delete old rules and lists
|
||||||
|
run: |
|
||||||
|
node cf_gateway_rule_delete.js
|
||||||
|
node cf_list_delete.js
|
||||||
|
env:
|
||||||
|
CLOUDFLARE_API_KEY: ${{ secrets.CLOUDFLARE_API_KEY }}
|
||||||
|
CLOUDFLARE_ACCOUNT_EMAIL: ${{ secrets.CLOUDFLARE_ACCOUNT_EMAIL }}
|
||||||
|
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
CLOUDFLARE_LIST_ITEM_LIMIT: ${{ secrets.CLOUDFLARE_LIST_ITEM_LIMIT }}
|
||||||
|
|
||||||
|
- name: Create new rules and lists
|
||||||
|
run: |
|
||||||
|
node cf_list_create.js
|
||||||
|
node cf_gateway_rule_create.js
|
||||||
|
env:
|
||||||
|
CLOUDFLARE_API_KEY: ${{ secrets.CLOUDFLARE_API_KEY }}
|
||||||
|
CLOUDFLARE_ACCOUNT_EMAIL: ${{ secrets.CLOUDFLARE_ACCOUNT_EMAIL }}
|
||||||
|
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||||
|
CLOUDFLARE_LIST_ITEM_LIMIT: ${{ secrets.CLOUDFLARE_LIST_ITEM_LIMIT }}
|
||||||
|
|
||||||
|
- name: Send ping request
|
||||||
|
if: env.PING_URL != ''
|
||||||
|
env:
|
||||||
|
PING_URL: ${{ secrets.PING_URL }}
|
||||||
|
run: |
|
||||||
|
curl "${{ env.PING_URL }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user