From cf1edf06cca967ff477cdc9e80a85f545e232719 Mon Sep 17 00:00:00 2001 From: xarantolus Date: Tue, 23 Apr 2024 20:43:19 +0200 Subject: [PATCH 1/2] Upgrade actions --- .github/workflows/build-filterlists.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-filterlists.yml b/.github/workflows/build-filterlists.yml index 7eef2c9e..6269714f 100644 --- a/.github/workflows/build-filterlists.yml +++ b/.github/workflows/build-filterlists.yml @@ -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 @@ -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 @@ -49,7 +41,7 @@ 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 @@ -57,7 +49,7 @@ jobs: 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 From b64b5ae6def382e855cbca12dd5a37c32941a2ff Mon Sep 17 00:00:00 2001 From: xarantolus Date: Thu, 2 May 2024 09:01:23 +0200 Subject: [PATCH 2/2] Do not fail entire job if last list download fails --- util/download.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/download.go b/util/download.go index b1e9279e..78a89037 100644 --- a/util/download.go +++ b/util/download.go @@ -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)) }