fix: migrate to malware-filter group

- BREAKING CHANGE
This commit is contained in:
Ming Di Leom 2022-05-11 07:43:02 +00:00
parent 6b286e583d
commit 277fe860b5
No known key found for this signature in database
GPG Key ID: 32D3E28E96A695E8
3 changed files with 7 additions and 9 deletions

View File

@ -14,8 +14,8 @@ const rootPath = join(__dirname, '..')
const tmpPath = join(rootPath, 'tmp') const tmpPath = join(rootPath, 'tmp')
const publicPath = join(rootPath, 'public') const publicPath = join(rootPath, 'public')
const zipPath = join(tmpPath, 'artifacts.zip') const zipPath = join(tmpPath, 'artifacts.zip')
const artifactsUrl = 'https://gitlab.com/curben/tracking-filter/-/jobs/artifacts/main/download?job=pages' const artifactsUrl = 'https://gitlab.com/malware-filter/tracking-filter/-/jobs/artifacts/main/download?job=pages'
const pipelineUrl = 'https://gitlab.com/curben/tracking-filter/badges/main/pipeline.svg' const pipelineUrl = 'https://gitlab.com/malware-filter/tracking-filter/badges/main/pipeline.svg'
const ghMirror = 'https://nightly.link/curbengh/tracking-filter/workflows/pages/main/public.zip' const ghMirror = 'https://nightly.link/curbengh/tracking-filter/workflows/pages/main/public.zip'
const pipelineStatus = async (url) => { const pipelineStatus = async (url) => {

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/curben/tracking-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200") ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/malware-filter/tracking-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200")
PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/curben/tracking-filter/badges/main/pipeline.svg" | grep -F "failed") PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/malware-filter/tracking-filter/badges/main/pipeline.svg" | grep -F "failed")
GITLAB_STATUS="up" GITLAB_STATUS="up"
if [ -z "$ARTIFACT_STATUS" ] || [ -n "$PIPELINE_STATUS" ]; then if [ -z "$ARTIFACT_STATUS" ] || [ -n "$PIPELINE_STATUS" ]; then

View File

@ -40,12 +40,10 @@ CURRENT_TIME="$(date -R -u)"
FIRST_LINE="! Title: Tracking JS Blocklist" FIRST_LINE="! Title: Tracking JS Blocklist"
SECOND_LINE="! Updated: $CURRENT_TIME" SECOND_LINE="! Updated: $CURRENT_TIME"
THIRD_LINE="! Expires: 7 day (update frequency)" THIRD_LINE="! Expires: 7 day (update frequency)"
FOURTH_LINE="! Homepage: https://gitlab.com/curben/tracking-filter" FOURTH_LINE="! Homepage: https://gitlab.com/malware-filter/tracking-filter"
FIFTH_LINE="! License: https://gitlab.com/curben/tracking-filter#license" FIFTH_LINE="! License: https://gitlab.com/malware-filter/tracking-filter#license"
SIXTH_LINE="! Source: https://github.com/duckduckgo/tracker-radar" SIXTH_LINE="! Source: https://github.com/duckduckgo/tracker-radar"
ANNOUNCEMENT_1="\n! 2021/01/08: There has been a major change to the mirrors, check the repo for the new mirrors." COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE"
ANNOUNCEMENT_2="! Old mirrors will be deprecated in 3 months. The main download link \"curben.gitlab.io/malware-filter/\" _is not affected_."
COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE\n$ANNOUNCEMENT_1\n$ANNOUNCEMENT_2"
mkdir -p "../public/" mkdir -p "../public/"