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

Oisd #4

Closed
wants to merge 2 commits into from
Closed

Oisd #4

wants to merge 2 commits into from

Conversation

norbertjoni
Copy link
Contributor

I am not sure if I am doing right, but I would like to pull this to the new branches named oisd.
New branch because oisd list works well with all alone.
This list prioritizes functionality over blocking.

@mrrfv
Copy link
Owner

mrrfv commented May 6, 2023

Your current pull request is set to merge the commits into main.

I believe this doesn't need a new branch - creating one just for a new filter list could make development much harder and complicated. Could you instead make a PR (or change your current one) that just modifies cf_list_create.js to work with OISD lists and creates a script used for downloading the oisd big list? Then the GitHub Action can be manually modified by the user to use OISD lists.

@norbertjoni
Copy link
Contributor Author

Yes probably be cleaner if I just close this and pull a new one.
Question:


    - 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

What's the reason to use v1 instead of main? I don't see any difference.

@mrrfv
Copy link
Owner

mrrfv commented May 7, 2023

It's used for versioning - we don't want to break the GitHub Action for people that just set up CGPS on their GitHub account and forgot about it. Every time a big change is introduced that will certainly break the project for GitHub Actions users (like more secrets being required, or some setting to be manually reviewed), a new branch will be created. Small fixes, such as adding compatibility with OISD lists, should still be merged with v1.

@norbertjoni norbertjoni closed this May 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants