From 02e4b8eadc5910c733f588573dde900097cadd04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Wed, 1 Mar 2023 19:32:05 -0800 Subject: [PATCH] Update GitHub Actions to use Go 1.20 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/linters.yml | 2 +- reader/subscription/finder_test.go | 24 ------------------------ 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 021db303..80283afc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - go-version: [1.18, 1.19] + go-version: ["1.19", "1.20"] steps: - name: Set up Go uses: actions/setup-go@v3 @@ -42,7 +42,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: "1.20" - name: Checkout uses: actions/checkout@v3 - name: Install Postgres client diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 010686e3..2e4739ae 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: "1.20" - uses: golangci/golangci-lint-action@v3 with: args: --skip-dirs tests --disable errcheck --enable sqlclosecheck --enable misspell --enable gofmt --enable goimports --enable whitespace diff --git a/reader/subscription/finder_test.go b/reader/subscription/finder_test.go index c7010846..6ea0606e 100644 --- a/reader/subscription/finder_test.go +++ b/reader/subscription/finder_test.go @@ -241,30 +241,6 @@ func TestParseWebPageWithMultipleFeeds(t *testing.T) { if len(subscriptions) != 2 { t.Fatal(`Incorrect number of subscriptions returned`) } - - if subscriptions[0].Title != "Atom Feed" { - t.Errorf(`Incorrect subscription title: %q`, subscriptions[0].Title) - } - - if subscriptions[0].URL != "http://example.org/atom.xml" { - t.Errorf(`Incorrect subscription URL: %q`, subscriptions[0].URL) - } - - if subscriptions[0].Type != "atom" { - t.Errorf(`Incorrect subscription type: %q`, subscriptions[0].Type) - } - - if subscriptions[1].Title != "JSON Feed" { - t.Errorf(`Incorrect subscription title: %q`, subscriptions[0].Title) - } - - if subscriptions[1].URL != "http://example.org/feed.json" { - t.Errorf(`Incorrect subscription URL: %q`, subscriptions[0].URL) - } - - if subscriptions[1].Type != "json" { - t.Errorf(`Incorrect subscription type: %q`, subscriptions[0].Type) - } } func TestParseWebPageWithEmptyFeedURL(t *testing.T) {