Skip to content

Commit

Permalink
Merge branch 'xarantolus:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
chromer030 authored Jan 16, 2025
2 parents 5c1b552 + b64b5ae commit 4291e5c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
18 changes: 5 additions & 13 deletions .github/workflows/build-filterlists.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ^1.15

- name: Download repo
uses: actions/checkout@v3

- name: Download dependencies
run: |
go get -v -t -d ./...
if [ -f Gopkg.toml ]; then
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
dep ensure
fi
uses: actions/checkout@v4

- name: Runnning build/generation script
shell: bash
Expand All @@ -39,7 +31,7 @@ jobs:
run: echo "TAG_NAME=$(date +%F-%H-%M)" >> $GITHUB_ENV

- name: Release filter lists
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: dist/*.dat
name: Automatic list generation
Expand All @@ -49,15 +41,15 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Delete older releases
uses: dev-drprasad/delete-older-releases@v0.2.1
uses: dev-drprasad/delete-older-releases@v0.3.3
with:
keep_latest: 2
delete_tags: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload log files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Logs
path: logs/*.log
Expand Down
2 changes: 2 additions & 0 deletions util/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ func DownloadURLs(inputURLs []string, tempDir string) (outputPaths []string, err
outputPaths = append(outputPaths, fn)
}

err = nil

if errCount > (len(inputURLs) / 2) {
err = fmt.Errorf("%d/%d urls couldn't be downloaded", errCount, len(inputURLs))
}
Expand Down

0 comments on commit 4291e5c

Please sign in to comment.