February pull 2 (#1354)

* Update FilterList.json * Update FilterListTag.json * Update FilterListLanguage.json * Update FilterListMaintainer.json * Update TPLSubscriptionAssistant.html * Update TPLSubscriptionAssistant.html close #1345 ref #1173
collinbarrett · Feb 13, 2020 · 87f1bb2 · 87f1bb2
1 parent d935f1d
commit 87f1bb2
Show file tree

Hide file tree

Showing 9 changed files with 80,076 additions and 144 deletions.
diff --git a/data/FilterList.json b/data/FilterList.json
diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json
@@ -2511,10 +2511,6 @@
     "filterListId": 1888,
     "languageId": 99
   },
-  {
-    "filterListId": 1889,
-    "languageId": 99
-  },
   {
     "filterListId": 1890,
     "languageId": 167
@@ -2562,5 +2558,37 @@
   {
     "filterListId": 1962,
     "languageId": 48
+  },
+  {
+    "filterListId": 2043,
+    "languageId": 99
+  },
+  {
+    "filterListId": 2044,
+    "languageId": 99
+  },
+  {
+    "filterListId": 2045,
+    "languageId": 99
+  },
+  {
+    "filterListId": 2046,
+    "languageId": 99
+  },
+  {
+    "filterListId": 2041,
+    "languageId": 44
+  },
+  {
+    "filterListId": 2041,
+    "languageId": 106
+  },
+  {
+    "filterListId": 1554,
+    "languageId": 10
+  },
+  {
+    "filterListId": 1554,
+    "languageId": 122
   }
-]
+]
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
@@ -483,6 +483,14 @@
     "filterListId": 785,
     "maintainerId": 14
   },
+  {
+    "filterListId": 2034,
+    "maintainerId": 14
+  },
+  {
+    "filterListId": 2035,
+    "maintainerId": 14
+  },
   {
     "filterListId": 566,
     "maintainerId": 15
@@ -951,10 +959,6 @@
     "filterListId": 1981,
     "maintainerId": 22
   },
-  {
-    "filterListId": 1982,
-    "maintainerId": 22
-  },
   {
     "filterListId": 1983,
     "maintainerId": 22
@@ -983,6 +987,10 @@
     "filterListId": 1991,
     "maintainerId": 22
   },
+  {
+    "filterListId": 2041,
+    "maintainerId": 22
+  },
   {
     "filterListId": 27,
     "maintainerId": 24
@@ -1587,6 +1595,10 @@
     "filterListId": 817,
     "maintainerId": 64
   },
+  {
+    "filterListId": 2042,
+    "maintainerId": 64
+  },
   {
     "filterListId": 412,
     "maintainerId": 66
@@ -4783,4 +4795,4 @@
     "filterListId": 1839,
     "maintainerId": 144
   }
-]
+]
diff --git a/data/FilterListTag.json b/data/FilterListTag.json
@@ -9195,10 +9195,6 @@
     "filterListId": 1888,
     "tagId": 10
   },
-  {
-    "filterListId": 1889,
-    "tagId": 2
-  },
   {
     "filterListId": 1890,
     "tagId": 2
@@ -9711,10 +9707,6 @@
     "filterListId": 1981,
     "tagId": 30
   },
-  {
-    "filterListId": 1982,
-    "tagId": 30
-  },
   {
     "filterListId": 1983,
     "tagId": 11
@@ -9982,5 +9974,117 @@
   {
     "filterListId": 2033,
     "tagId": 2
+  },
+  {
+    "filterListId": 2034,
+    "tagId": 32
+  },
+  {
+    "filterListId": 2035,
+    "tagId": 32
+  },
+  {
+    "filterListId": 2037,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2037,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2037,
+    "tagId": 6
+  },
+  {
+    "filterListId": 2038,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2038,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2038,
+    "tagId": 6
+  },
+  {
+    "filterListId": 2039,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2039,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2039,
+    "tagId": 6
+  },
+  {
+    "filterListId": 2040,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2040,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2040,
+    "tagId": 6
+  },
+  {
+    "filterListId": 2041,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2041,
+    "tagId": 6
+  },
+  {
+    "filterListId": 2042,
+    "tagId": 30
+  },
+  {
+    "filterListId": 2043,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2043,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2044,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2044,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2045,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2045,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2046,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2046,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2036,
+    "tagId": 2
+  },
+  {
+    "filterListId": 2036,
+    "tagId": 3
+  },
+  {
+    "filterListId": 2036,
+    "tagId": 6
   }
-]
+]
diff --git a/data/TPLSubscriptionAssistant.html b/data/TPLSubscriptionAssistant.html
@@ -23,6 +23,7 @@
 <a href="javascript:window.external.msAddTrackingProtectionList('https://easylist-msie.adblockplus.org/antiadblockfilters.tpl', 'Adblock Warning Removal List')">Adblock Warning Removal List</a> - <a href="https://easylist-msie.adblockplus.org/antiadblockfilters.tpl">View ruleset</a><br>
 <a href="javascript:window.external.msAddTrackingProtectionList('https://easylist-msie.adblockplus.org/fanboy-annoyance.tpl', 'Fanboy\'s Annoyance List')">Fanboy's Annoyance List</a> - <a href="https://easylist-msie.adblockplus.org/fanboy-annoyance.tpl">View ruleset</a><br>
 <a href="javascript:window.external.msAddTrackingProtectionList('https://easylist-msie.adblockplus.org/fanboy-social.tpl', 'Fanboy\'s Social Blocking List')">Fanboy's Social Blocking List</a> - <a href="https://easylist-msie.adblockplus.org/fanboy-social.tpl">View ruleset</a><br>
+<a href="javascript:window.external.msAddTrackingProtectionList('https://easylist-msie.adblockplus.org/fanboy-notifications.tpl', 'Fanboy\'s Notifications Blocking List')">Fanboy's Notifications Blocking List</a> - <a href="https://easylist-msie.adblockplus.org/fanboy-notifications.tpl">View ruleset</a><br>
 <a href="javascript:window.external.msAddTrackingProtectionList('https://easylist-msie.adblockplus.org/malwaredomains_full.tpl', 'DNS-BH Malware Domains')">DNS-BH Malware Domains</a> - <a href="https://easylist-msie.adblockplus.org/malwaredomains_full.tpl">View ruleset</a><br>
 <a href="javascript:window.external.msAddTrackingProtectionList('https://pgl.yoyo.org/adservers/serverlist.tpl', 'Peter Lowe\'s List')">Peter Lowe's List</a> - <a href="https://pgl.yoyo.org/adservers/serverlist.tpl">View ruleset</a><br>
 <a href="javascript:window.external.msAddTrackingProtectionList('https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareTPL.tpl', 'Dandelion Sprout\'s Anti-Malware List')">Dandelion Sprout's Anti-Malware List</a> - <a href="https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareTPL.tpl">View ruleset</a><br><br>

diff --git a/server/azure-pipelines.migrate.yaml b/server/azure-pipelines.migrate.yaml
@@ -16,10 +16,12 @@ pool:
 steps:
   - checkout: none
 
-  # TODO: Replace $(System.PullRequest.SourceRepositoryUri) with fork's URI. https://stackoverflow.com/q/60188806/2343739
-  - script: |
-      git clone $(System.PullRequest.SourceRepositoryUri) .
-      git checkout $(System.PullRequest.SourceBranch)
+  - bash: |
+      FORKURI=$(curl -X GET https://api.github.com/repos/$BUILD_REPOSITORY_NAME/pulls/$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER | jq '.head.repo.clone_url')
+      FORKURI="${FORKURI%\"}"
+      FORKURI="${FORKURI#\"}"
+      git clone "$FORKURI" .
+      git checkout $SYSTEM_PULLREQUEST_SOURCEBRANCH
     displayName: checkout source branch
 
   # TODO: validate author of last commit was $(GITHUBNAME)