Merge remote-tracking branch 'origin/develop'

mozillazg · Dec 11, 2021 · 04a7095 · 04a7095
2 parents 9c8aa84 + 773f9d0
commit 04a7095
Show file tree

Hide file tree

Showing 8 changed files with 319 additions and 249 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,47 @@
+name: CI
+
+on:
+  push:
+    branches:
+    - master
+    - develop
+  pull_request:
+    branches:
+    - master
+    - develop
+
+jobs:
+
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.17
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: |
+        go get -v -t -d ./...
+
+    - name: Build
+      run: go build -v .
+
+    - name: Test
+      run: go test -v .
+
+    - name: Test cmd
+      run: |
+        go get ./cmd/pinyin
+        go run cmd/pinyin/main.go 测试
+        go run cmd/pinyin/main.go -s zhao 测试
+        echo 测试 | go run cmd/pinyin/main.go
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.19.0] (2021-12-11)
+* **Changed** 使用 [pinyin-data][pinyin-data] v0.12.0 的拼音数据
+
+
 ## [0.18.0] (2020-06-13)
 * **Changed** 使用 [pinyin-data][pinyin-data] v0.9.0 的拼音数据
 * **Bugfixed** 修复自定义的 Fallback 函数可能会导致结果乱码的问题 Fixes [#35]
@@ -233,3 +237,4 @@
 [0.16.0]: https://github.com/mozillazg/go-pinyin/compare/v0.15.0...v0.16.0
 [0.17.0]: https://github.com/mozillazg/go-pinyin/compare/v0.16.0...v0.17.0
 [0.18.0]: https://github.com/mozillazg/go-pinyin/compare/v0.17.0...v0.18.0
+[0.19.0]: https://github.com/mozillazg/go-pinyin/compare/v0.18.0...v0.19.0
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 go-pinyin
 =========
 
-[![Build Status](https://travis-ci.org/mozillazg/go-pinyin.svg?branch=master)](https://travis-ci.org/mozillazg/go-pinyin)
+[![Build Status](https://github.com/mozillazg/go-pinyin/actions/workflows/go.yml/badge.svg?branch=master)](https://github.com/mozillazg/go-pinyin/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/mozillazg/go-pinyin/badge.svg?branch=master)](https://coveralls.io/r/mozillazg/go-pinyin?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/mozillazg/go-pinyin)](https://goreportcard.com/report/github.com/mozillazg/go-pinyin)
 [![GoDoc](https://godoc.org/github.com/mozillazg/go-pinyin?status.svg)](https://godoc.org/github.com/mozillazg/go-pinyin)

diff --git a/TODO.md b/TODO.md
@@ -0,0 +1,4 @@
+
+
+* [ ] 重构 
+* [ ]
diff --git a/_tools/pinyin-data b/_tools/pinyin-data
diff --git a/pinyin.go b/pinyin.go
@@ -7,7 +7,7 @@ import (
 
 // Meta
 const (
-	Version   = "0.18.0"
+	Version   = "0.19.0"
 	Author    = "mozillazg, 闲耘"
 	License   = "MIT"
 	Copyright = "Copyright (c) 2016 mozillazg, 闲耘"
+1 −1		.bumpversion.cfg
+31 −0		.github/workflows/python-app.yml
+1 −0		.gitignore
+6 −0		.gitmodules
+36 −0		CHANGELOG.md
+7 −1		Makefile
+20 −5		README.md
+6,261 −0		cc_cedict.txt
+55 −13		kMandarin.txt
+14 −14		kMandarin_8105.txt
+3 −0		kMandarin_overwrite.txt
+8,105 −0		kTGHZ2013.txt
+2 −1		kXHC1983.txt
+5 −1		merge_unihan.py
+12 −1		overwrite.txt
+261 −219		pinyin.txt
+46 −0		tools/gen_cc_cedict.py
+1 −0		tools/phrase-pinyin-data
+1 −0		tools/python-pinyin
+1 −0		unihan/kTGHZ2013.txt
+9 −1		unihan/parse_pinyin.py
+3 −3		zdic.txt