Skip to content

Commit 4291e5c

Browse files
authored
Merge branch 'xarantolus:main' into main
2 parents 5c1b552 + b64b5ae commit 4291e5c

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

.github/workflows/build-filterlists.yml

+5-13
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,12 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Set up Go
18-
uses: actions/setup-go@v4
18+
uses: actions/setup-go@v5
1919
with:
2020
go-version: ^1.15
2121

2222
- name: Download repo
23-
uses: actions/checkout@v3
24-
25-
- name: Download dependencies
26-
run: |
27-
go get -v -t -d ./...
28-
if [ -f Gopkg.toml ]; then
29-
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
30-
dep ensure
31-
fi
23+
uses: actions/checkout@v4
3224

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

4133
- name: Release filter lists
42-
uses: softprops/action-gh-release@v1
34+
uses: softprops/action-gh-release@v2
4335
with:
4436
files: dist/*.dat
4537
name: Automatic list generation
@@ -49,15 +41,15 @@ jobs:
4941
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5042

5143
- name: Delete older releases
52-
uses: dev-drprasad/delete-older-releases@v0.2.1
44+
uses: dev-drprasad/delete-older-releases@v0.3.3
5345
with:
5446
keep_latest: 2
5547
delete_tags: true
5648
env:
5749
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5850

5951
- name: Upload log files
60-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
6153
with:
6254
name: Logs
6355
path: logs/*.log

util/download.go

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ func DownloadURLs(inputURLs []string, tempDir string) (outputPaths []string, err
5555
outputPaths = append(outputPaths, fn)
5656
}
5757

58+
err = nil
59+
5860
if errCount > (len(inputURLs) / 2) {
5961
err = fmt.Errorf("%d/%d urls couldn't be downloaded", errCount, len(inputURLs))
6062
}

0 commit comments

Comments
 (0)