You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/03/06 10:45:51 UTC

[dubbo-go] branch 1.5 updated (415e245 -> 698908d)

This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a change to branch 1.5
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.


 discard 415e245  Merge pull request #1067 from apache/feture/linter
    omit 1948650  Merge branch '1.5' into feture/linter
    omit d054fc5  move linter to makefile
    omit 31a9418  Merge pull request #1068 from zouyx/feature/fixIntegration
     new 698908d  Merge pull request #1068 from zouyx/feature/fixIntegration

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (415e245)
            \
             N -- N -- N   refs/heads/1.5 (698908d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/github-actions.yml | 16 ++++++++--------
 Makefile                             | 22 +++++-----------------
 README.md                            |  2 +-
 3 files changed, 14 insertions(+), 26 deletions(-)


[dubbo-go] 01/01: Merge pull request #1068 from zouyx/feature/fixIntegration

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git

commit 698908ddceecc2baf68b495c8ba44f00b0d9016b
Merge: f1f81eb b8c51a7
Author: Xin.Zh <dr...@foxmail.com>
AuthorDate: Sat Mar 6 13:24:03 2021 +0800

    Merge pull request #1068 from zouyx/feature/fixIntegration
    
    Fix: integration test in Action

 .github/workflows/github-actions.yml      |   8 +-
 README.md                                 |   2 +-
 go.mod                                    |   2 +-
 test/integrate/dubbo/go-client/Dockerfile |   2 +-
 test/integrate/dubbo/go-client/go.mod     |   5 -
 test/integrate/dubbo/go-client/go.sum     | 928 ------------------------------
 test/integrate/dubbo/go-server/Dockerfile |   2 +-
 test/integrate/dubbo/go-server/go.mod     |   5 -
 test/integrate/dubbo/go-server/go.sum     | 928 ------------------------------
 9 files changed, 8 insertions(+), 1874 deletions(-)

diff --cc .github/workflows/github-actions.yml
index c0bc085,575c3a1..865b60e
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@@ -56,7 -56,7 +56,7 @@@ jobs
  
      - name: gofmt
        run: |
--        go fmt ./... && git checkout -- go.mod && git status && [[ -z `git status -s` ]]
++        go fmt ./... && git status && [[ -z `git status -s` ]]
          # diff -u <(echo -n) <(gofmt -d -s .)
  
      - name: Install go ci lint
diff --cc README.md
index 66cf541,66cf541..4a39faa
--- a/README.md
+++ b/README.md
@@@ -177,7 -177,7 +177,7 @@@ If you are willing to do some code cont
  
  ## Community
  
--If u want to communicate with our community, pls scan the following  [dubbobo Ding-Ding QR code](https://mmbiz.qpic.cn/mmbiz_jpg/yvBJb5IiafvnHVBdtia30dxA2hKotr9DEckWsZ7aOJcDWDaSVMGwLmYv8GRgIQtqb4C2svicp8nVkMmGy7yKC5tyA/640?wx_fmt=jpeg&tp=webp&wxfrom=5&wx_lazy=1&wx_co=1) or search our commnity DingDing group code 31363295.
++If u want to communicate with our community, pls scan the following dubbobo Ding-Ding QR code or search our commnity DingDing group code 31363295.
  
  <div>
  <table>
diff --cc go.mod
index bb456a7,bb456a7..c1643ed
--- a/go.mod
+++ b/go.mod
@@@ -1,6 -1,6 +1,6 @@@
  module github.com/apache/dubbo-go
  
--go 1.13
++go 1.15
  
  require (
  	github.com/NYTimes/gziphandler v1.1.1 // indirect