Update GHA, go1.14 vendored mode

Update Makefile, add go vendor (go 1.14 + php hack)
Update usage of new json package

1 files changed, 4 insertions, 2 deletions

diff --git a/service/http/service_test.go b/service/http/service_test.go
index 44aba576..53dbb3df 100644
--- a/service/http/service_test.go
+++ b/service/http/service_test.go
@@ -43,7 +43,8 @@ func (cfg *testCfg) Get(name string) service.Config {
 	return nil
 }
 func (cfg *testCfg) Unmarshal(out interface{}) error {
-	return json.Unmarshal([]byte(cfg.target), out)
+	j := json.ConfigCompatibleWithStandardLibrary
+	return j.Unmarshal([]byte(cfg.target), out)
 }
 
 func Test_Service_NoConfig(t *testing.T) {
@@ -554,7 +555,8 @@ func Test_Service_Error4(t *testing.T) {
 
 func tmpDir() string {
 	p := os.TempDir()
-	r, _ := json.Marshal(p)
+	j := json.ConfigCompatibleWithStandardLibrary
+	r, _ := j.Marshal(p)
 
 	return string(r)
 }