diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 505c90e..ffe0b85 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -16,7 +16,7 @@ jobs: apk update apk add brotli curl git grep - name: Build - run: sh src/script.sh + run: npm run build - name: Compress run: | find . -name "oisd*.txt" -type f -print0 | xargs -0 gzip -f -k -9 @@ -48,7 +48,6 @@ jobs: NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} if: ${{ env.NETLIFY_SITE_ID != 0 && env.GITLAB_STATUS == 'down' }} run: | - npm install npm install netlify-cli -g netlify --telemetry-disable netlify deploy --dir=public --prod diff --git a/src/script.sh b/src/script.sh index ac92eec..7e663d0 100644 --- a/src/script.sh +++ b/src/script.sh @@ -1,3 +1,5 @@ +## replaced by src/build.js + #!/bin/sh # works best on busybox sh @@ -16,6 +18,7 @@ curl "https://gitlab.com/curben/urlhaus-filter/-/jobs/artifacts/main/download?jo curl "https://gitlab.com/curben/phishing-filter/-/jobs/artifacts/main/download?job=pages" -o "phishing-filter.zip" curl "https://gitlab.com/curben/pup-filter/-/jobs/artifacts/main/download?job=pages" -o "pup-filter.zip" curl "https://gitlab.com/curben/tracking-filter/-/jobs/artifacts/main/download?job=pages" -o "tracking-filter.zip" +curl "https://gitlab.com/curben/vn-badsite-filter/-/jobs/artifacts/main/download?job=pages" -o "vn-badsite-filter.zip" for zipfile in $(find . -name "*.zip" -type f) do