🔥 up: remove error sub-pkg dotnev/, update ci config and some tests

gookit · Feb 11, 2023 · d52926f · d52926f
1 parent 79acc56
commit d52926f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 92 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_version: [1.16, 1.17, 1.18, 1.19]
+        go_version: [1.18, 1.19, '1.20']
 
     steps:
     - name: Check out code

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,8 +10,6 @@ jobs:
     name: Release new version
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    strategy:
-      fail-fast: true
 
     steps:
       - name: Checkout

diff --git a/dotnev/README.md b/dotnev/README.md
diff --git a/dotnev/dotenv.go b/dotnev/dotenv.go
diff --git a/read_test.go b/read_test.go
@@ -105,7 +105,7 @@ func TestGet(t *testing.T) {
 	val = Get("name")
 	is.Eq("app", val)
 
-	is.Eq([]string{"php", "go"}, StringsBySplit("tagStr", ","))
+	is.Eq([]string{"php", "go"}, StringsBySplit("tagsStr", ","))
 
 	// get string array
 	arr := Strings("notExist")
@@ -433,7 +433,7 @@ func TestParseEnv(t *testing.T) {
 
 	tests := []struct{ EKey, EVal, CKey, CVal string }{
 		{"EnvKey", "EnvKey val", "ekey", "EnvKey val"},
-		{"EnvKey", "", "ekey", "${EnvKey}"},
+		{"EnvKey", "", "ekey", ""},
 		{"EnvKey0", "EnvKey0 val", "ekey0", "EnvKey0 val"},
 		{"EnvKey3", "EnvKey3 val", "ekey3", "EnvKey3 val"},
 		{"EnvKey3", "", "ekey3", "app:run"},
@@ -470,6 +470,6 @@ func TestParseEnv(t *testing.T) {
 	}, func() {
 		is.Eq("abc", Getenv("FirstEnv"))
 		is.Eq("", Getenv("SecondEnv"))
-		is.Eq("abc/${ SecondEnv }", cfg.String("ekey4"))
+		is.Eq("abc/", cfg.String("ekey4"))
 	})
 }
diff --git a/testdata/config.bak.json b/testdata/config.bak.json
@@ -14,8 +14,10 @@
     "key": "val",
     "key1": "val1",
     "key2": "val2",
-    "key3": "${SHELL}"
+    "key3": "${SHELL}",
+    "key4": "230"
   },
   "name": "app",
-  "new-key": "new-value"
-}
+  "new-key": "new-value",
+  "tagsStr": "php,go"
+}
diff --git a/testdata/issues59.ini b/testdata/issues59.ini
@@ -1,12 +1,16 @@
+# exported at 2023-02-11 14:42:13
+
 age = 123
 baseKey = value
 debug = false
 envKey = ${SHELL}
 envKey1 = ${NotExist|defValue}
 multiWords = hello world
 name = app
+
 [map1]
 key = val
 key1 = val1
 key2 = val2
 
+