aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.eu>2022-08-09 20:57:34 +0200
committerRené 'Necoro' Neumann <necoro@necoro.eu>2023-01-22 23:22:08 +0100
commit35f7fe3af67057b5595fe6abee62641a118f3461 (patch)
tree36db53f8b299e9dd4034d1174768129a7b85b870
parent35350d76a03e48d62db6eecb8b6da5ea41fd9dfd (diff)
downloadfeed2imap-go-35f7fe3af67057b5595fe6abee62641a118f3461.tar.gz
feed2imap-go-35f7fe3af67057b5595fe6abee62641a118f3461.tar.bz2
feed2imap-go-35f7fe3af67057b5595fe6abee62641a118f3461.zip
Upgrade to Go 1.19
-rw-r--r--.github/workflows/go.yml4
-rw-r--r--.github/workflows/release.yml4
-rw-r--r--go.mod2
-rw-r--r--internal/feed/template/funcs.go3
4 files changed, 7 insertions, 6 deletions
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 0ff0613..32e1f37 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- - name: Set up Go 1.18
+ - name: Set up Go 1.19
uses: actions/setup-go@v3
with:
- go-version: 1.18
+ go-version: 1.19
id: go
- name: Checkout
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d80df24..769c97b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- - name: Set up Go 1.18
+ - name: Set up Go 1.19
uses: actions/setup-go@v3
with:
- go-version: 1.18
+ go-version: 1.19
id: go
- name: Checkout
diff --git a/go.mod b/go.mod
index 790b3d1..03dd157 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/Necoro/feed2imap-go
-go 1.18
+go 1.19
require (
github.com/Necoro/go-readability v0.0.0-20220610220921-ea81c68a0622
diff --git a/internal/feed/template/funcs.go b/internal/feed/template/funcs.go
index fbfb572..6487ae2 100644
--- a/internal/feed/template/funcs.go
+++ b/internal/feed/template/funcs.go
@@ -5,6 +5,7 @@ import (
html "html/template"
"strconv"
"strings"
+ text "text/template"
"github.com/Necoro/feed2imap-go/pkg/log"
)
@@ -63,7 +64,7 @@ func _html(s string) html.HTML {
return html.HTML(s)
}
-var funcMap = map[string]any{
+var funcMap = text.FuncMap{
"dict": dict,
"join": join,
"lastUrlPart": lastUrlPart,