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

JSON adblock resources support #74

Merged
merged 2 commits into from
Nov 12, 2019
Merged

JSON adblock resources support #74

merged 2 commits into from
Nov 12, 2019

Conversation

antonok-edm
Copy link
Collaborator

Similar to #73, but using the newer web_accessible_resources and scriptlets.js resources from the uBlock Origin repo.

Brave's audited fork of uBlock Origin is added as a submodule.

@antonok-edm antonok-edm self-assigned this Oct 2, 2019
@antonok-edm
Copy link
Collaborator Author

@mihaiplesa some CI script changes will be needed after it gets merged - namely, the properly audited commit of uBlock Origin (currently 978f04219a1f41f3fab7ad5c38ec2a1a021920fe) will need to be checked out as the git submodule.

@mihaiplesa
Copy link
Contributor

@antonok-edm sounds good.

@bbondy
Copy link
Member

bbondy commented Nov 12, 2019

@mihaiplesa this is ready to be merged but it will require these additional commands to be added to the ad-block nightly job.

After the clone....

git submodule init
git submodule update

Then proceed with the rest.

@bbondy bbondy merged commit c0a4986 into master Nov 12, 2019
@bsclifton bsclifton deleted the json_resources branch April 13, 2020 21:45
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.

3 participants