Mercurial > gemma

changeset 4411:5826d4de0e40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Workarounds for incompatible upstream updates in pgx and cron packages.
author Sascha Wilde <wilde@intevation.de>
date Tue, 17 Sep 2019 16:28:47 +0200
parents 3759b47f20f3
children 14de1ea7000b
files 3rdpartylibs.sh pkg/models/importbase.go pkg/scheduler/scheduler.go
diffstat 3 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/3rdpartylibs.sh	Tue Sep 17 16:08:45 2019 +0200
+++ b/3rdpartylibs.sh	Tue Sep 17 16:28:47 2019 +0200
@@ -1,5 +1,14 @@
 #!/bin/sh
-go get -u -v github.com/jackc/pgx
+
+# pgx hase undergone some major incompatible changes in v4,
+# we need to stick to v3 for now...
+# Unfortunatly using gopkg.in does not work as expected here, so lets
+# get hackisch...
+go get -u -v gopkg.in/jackc/pgx.v3
+oldcwd="$CWD"
+cd "$GOPATH"/src/github.com/jackc/pgx
+git checkout v3.6.0
+cd "$oldcwd"
 # MIT
 
 go get -u -v github.com/etcd-io/bbolt/...
@@ -32,7 +41,7 @@
 go get -u -v github.com/jonas-p/go-shp
 # MIT
 
-go get -u -v github.com/robfig/cron
+go get -u -v gopkg.in/robfig/cron.v1
 # MIT
 
 go get -u -v github.com/tidwall/rtree
--- a/pkg/models/importbase.go	Tue Sep 17 16:08:45 2019 +0200
+++ b/pkg/models/importbase.go	Tue Sep 17 16:28:47 2019 +0200
@@ -19,7 +19,7 @@
 	"time"
 
 	"gemma.intevation.de/gemma/pkg/common"
-	"github.com/robfig/cron"
+	cron "gopkg.in/robfig/cron.v1"
 )
 
 type (
--- a/pkg/scheduler/scheduler.go	Tue Sep 17 16:08:45 2019 +0200
+++ b/pkg/scheduler/scheduler.go	Tue Sep 17 16:28:47 2019 +0200
@@ -19,7 +19,7 @@
 	"strings"
 	"sync"
 
-	"github.com/robfig/cron"
+	cron "gopkg.in/robfig/cron.v1"
 )
 
 // Action is called with a configuration id.