Merge branch 'main' into s3-session

Ilhasoft · Jun 9, 2021 · 0e55778 · 0e55778
2 parents 0b1c23c + bf13e44
commit 0e55778
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,9 @@ jobs:
 
     - name: Upload coverage
       if: success()
-      run: bash <(curl -s https://codecov.io/bash)
+      uses: codecov/codecov-action@v1
+      with:
+        fail_ci_if_error: false
 
   release:
     name: Release

diff --git a/core/goflow/flows_test.go b/core/goflow/flows_test.go
@@ -46,12 +46,12 @@ func TestCloneDefinition(t *testing.T) {
 
 	cloned, err := goflow.CloneDefinition([]byte(`{"uuid": "502c3ee4-3249-4dee-8e71-c62070667d52", "name": "New", "spec_version": "13.0.0", "type": "messaging", "language": "eng", "nodes": []}`), nil)
 	assert.NoError(t, err)
-	test.AssertEqualJSON(t, []byte(`{"uuid": "1ae96956-4b34-433e-8d1a-f05fe6923d6d", "name": "New", "spec_version": "13.0.0", "type": "messaging", "language": "eng", "nodes": []}`), cloned, "cloned flow mismatch")
+	test.AssertEqualJSON(t, []byte(`{"uuid": "1ae96956-4b34-433e-8d1a-f05fe6923d6d", "name": "New", "spec_version": "13.0.0", "type": "messaging", "language": "eng", "nodes": []}`), cloned)
 }
 
 func TestMigrateDefinition(t *testing.T) {
 	// 13.0 > 13.1
 	migrated, err := goflow.MigrateDefinition([]byte(`{"uuid": "502c3ee4-3249-4dee-8e71-c62070667d52", "name": "New", "spec_version": "13.0.0", "type": "messaging", "language": "eng", "nodes": []}`), semver.MustParse("13.1.0"))
 	assert.NoError(t, err)
-	test.AssertEqualJSON(t, []byte(`{"uuid": "502c3ee4-3249-4dee-8e71-c62070667d52", "name": "New", "spec_version": "13.1.0", "type": "messaging", "language": "eng", "nodes": []}`), migrated, "migrated flow mismatch")
+	test.AssertEqualJSON(t, []byte(`{"uuid": "502c3ee4-3249-4dee-8e71-c62070667d52", "name": "New", "spec_version": "13.1.0", "type": "messaging", "language": "eng", "nodes": []}`), migrated)
 }
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.10.0 // indirect
 	github.com/nyaruka/ezconf v0.2.1
 	github.com/nyaruka/gocommon v1.10.0
-	github.com/nyaruka/goflow v0.119.0
+	github.com/nyaruka/goflow v0.120.1
 	github.com/nyaruka/librato v1.0.0
 	github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d
 	github.com/nyaruka/null v1.2.0

diff --git a/go.sum b/go.sum
@@ -135,8 +135,8 @@ github.com/nyaruka/ezconf v0.2.1/go.mod h1:ey182kYkw2MIi4XiWe1FR/mzI33WCmTWuceDY
 github.com/nyaruka/gocommon v1.9.1/go.mod h1:erbS4s2Rm1WdMILi2A1ye0nuU7FB4UOmSo4n0gETNsQ=
 github.com/nyaruka/gocommon v1.10.0 h1:V+UIyuuLAW/VqevctEbWFee4m6as/5ef3fg5fprnGTA=
 github.com/nyaruka/gocommon v1.10.0/go.mod h1:Jn7UIE8zwIr4JaviDf4PZrrQlN8r6QGVhOuaF/JoKus=
-github.com/nyaruka/goflow v0.119.0 h1:r5IUAxDBSRAzAkutdXQWJv/xJrT7x2PgJGgrS0JhsQU=
-github.com/nyaruka/goflow v0.119.0/go.mod h1:ww5fDMDuYAkf1yuPmhP2gCRYREpyrHdM28uoTZGxWhw=
+github.com/nyaruka/goflow v0.120.1 h1:/8cZNKshBJ3q6BUo0NDbOXWnp+R0aiqfs8/Fv6vCR+c=
+github.com/nyaruka/goflow v0.120.1/go.mod h1:ww5fDMDuYAkf1yuPmhP2gCRYREpyrHdM28uoTZGxWhw=
 github.com/nyaruka/librato v1.0.0 h1:Vznj9WCeC1yZXbBYyYp40KnbmXLbEkjKmHesV/v2SR0=
 github.com/nyaruka/librato v1.0.0/go.mod h1:pkRNLFhFurOz0QqBz6/DuTFhHHxAubWxs4Jx+J7yUgg=
 github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d h1:hyp9u36KIwbTCo2JAJ+TuJcJBc+UZzEig7RI/S5Dvkc=