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.

Sign up for GitHub

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

Use git submodules #2080

Merged
merged 1 commit into from
Jul 29, 2021
+17 −14
Merged

Use git submodules #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ dist
node_modules
.nyc_output
packages/adblocker-benchmarks/requests.json
packages/adblocker-benchmarks/blockers/ublock
packages/adblocker-benchmarks/blockers/uAssets
packages/adblocker-benchmarks/blockers/adblockpluscore

bench/dataset/chromedriver
bench/dataset/ext.zip
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "packages/adblocker-benchmarks/blockers/ublock"]
mjethani marked this conversation as resolved.
Show resolved Hide resolved
path = packages/adblocker-benchmarks/blockers/ublock
url = https://github.com/gorhill/ublock
[submodule "packages/adblocker-benchmarks/blockers/adblockpluscore"]
path = packages/adblocker-benchmarks/blockers/adblockpluscore
url = https://github.com/adblockplus/adblockpluscore
20 changes: 9 additions & 11 deletions packages/adblocker-benchmarks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@ all: deps run
requests.json:
curl https://cdn.cliqz.com/adblocking/requests_top500.json.gz | gunzip > requests.json

# VERSION: e1222d16430d754e8a2499fd8c58f49880d6c283
./blockers/ublock:
git clone https://github.com/gorhill/ublock ./blockers/ublock
git clone --depth 1 https://github.com/uBlockOrigin/uAssets.git ./blockers/uAssets
cd ./blockers/ublock && git checkout --quiet e1222d16430d754e8a2499fd8c58f49880d6c283 && ./tools/make-nodejs.sh
./blockers/ublock/.git:
git submodule update --recursive --depth 1 --init blockers/ublock
mjethani marked this conversation as resolved.
Show resolved Hide resolved

./node_modules/uBO-snfe:
cd ./blockers/ublock && ./tools/make-nodejs.sh
npm install --no-save ./blockers/ublock/dist/build/uBlock0.nodejs

ubo-snfe: ./blockers/ublock
ubo-snfe: ./blockers/ublock/.git ./node_modules/uBO-snfe
mjethani marked this conversation as resolved.
Show resolved Hide resolved

# VERSION: ebfc7b0300879ad44dba6a051c3c34b508b5a4f7
./blockers/adblockpluscore:
git clone https://github.com/adblockplus/adblockpluscore.git ./blockers/adblockpluscore
cd ./blockers/adblockpluscore && git reset --hard ebfc7b0300879ad44dba6a051c3c34b508b5a4f7
./blockers/adblockpluscore/.git:
git submodule update --recursive --depth 1 --init blockers/adblockpluscore

adblockpluscore: ./blockers/adblockpluscore
adblockpluscore: ./blockers/adblockpluscore/.git

./node_modules/adblock-rs:
npm install --no-save adblock-rs
Expand Down
1 change: 1 addition & 0 deletions packages/adblocker-benchmarks/blockers/adblockpluscore
Open in desktop
Submodule adblockpluscore added at ebfc7b
1 change: 1 addition & 0 deletions packages/adblocker-benchmarks/blockers/ublock
Open in desktop
Submodule ublock added at 63591e