diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 4d5c5f2f9..867620823 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -13,7 +13,7 @@ jobs: build: strategy: matrix: - go: [ 1.16, 1.17, 1.18 ] + go: [1.16, 1.17, 1.18] name: build & test runs-on: ubuntu-latest services: @@ -35,11 +35,6 @@ jobs: ports: - "8848:8848" - "9848:9848" - polaris: - image: huyuanxin/polaris-server-with-config:latest - ports: - - 8090:8090 - - 8091:8091 steps: - uses: actions/checkout@v2 - name: Set up Go diff --git a/contrib/registry/consul/registry_test.go b/contrib/registry/consul/registry_test.go index 82b7b0412..e6b85e7d9 100644 --- a/contrib/registry/consul/registry_test.go +++ b/contrib/registry/consul/registry_test.go @@ -57,10 +57,6 @@ func TestRegister(t *testing.T) { } ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) defer cancel() - err = r.Deregister(ctx, svc) - if err != nil { - t.Errorf("Deregister failed: %v", err) - } err = r.Register(ctx, svc) if err != nil { t.Errorf("Register failed: %v", err) @@ -86,6 +82,10 @@ func TestRegister(t *testing.T) { if !reflect.DeepEqual(version, services[0].Version) { t.Errorf("no expect float_key value: %v, but got: %v", services[0].Version, version) } + err = r.Deregister(ctx, svc) + if err != nil { + t.Errorf("Deregister failed: %v", err) + } } func getIntranetIP() string { diff --git a/hack/.test_ignored_files b/hack/.test_ignored_files index 52d736ef4..baada5c1c 100644 --- a/hack/.test_ignored_files +++ b/hack/.test_ignored_files @@ -5,6 +5,5 @@ ./contrib/config/kubernetes ./contrib/registry/kubernetes ./contrib/registry/zookeeper -./contrib/registry/etcd -./contrib/registry/consul ./contrib/registry/eureka +./contrib/registry/polaris