Merge pull request #1907 from zhaoyunxing92/ci
Modifying the CI Process
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index e664a7b..4417cad 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -7,83 +7,71 @@
branches: "*"
jobs:
-
build:
- name: ${{ matrix.os }} - Go ${{ matrix.go_version }}
+ name: ${{ matrix.os }} - go ${{ matrix.go }}
runs-on: ${{ matrix.os }}
strategy:
# If you want to matrix build , you can append the following list.
matrix:
- go_version:
- - 1.13
+ go:
+ - 1.15
os:
- ubuntu-latest
-
- env:
- DING_TOKEN: ${{ secrets.DING_TOKEN }}
- DING_SIGN: ${{ secrets.DING_SIGN }}
-
steps:
+ - name: Set up Go 1.x
+ uses: actions/setup-go@v2
+ with:
+ go-version: ${{ matrix.go }}
- - name: Set up Go 1.x
- uses: actions/setup-go@v2
- with:
- go-version: ${{ matrix.go_version }}
- id: go
+ - name: Check out code into the Go module directory
+ uses: actions/checkout@v3
- - name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ - name: Cache dependencies
+ uses: actions/cache@v2.1.4
+ with:
+ # Cache
+ path: ~/go/pkg/mod
+ # Cache key
+ key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+ # An ordered list of keys to use for restoring the cache if no cache hit occurred for key
+ restore-keys: |
+ ${{ runner.os }}-go-
- - name: Cache dependencies
- uses: actions/cache@v2.1.4
- with:
- # Cache
- path: ~/go/pkg/mod
- # Cache key
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- # An ordered list of keys to use for restoring the cache if no cache hit occurred for key
- restore-keys: |
- ${{ runner.os }}-go-
+ - name: Get dependencies
+ run: |
+ if [ -f Gopkg.toml ]; then
+ curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+ dep ensure
+ else
+ go get -v -t -d ./...
+ fi
- - name: Get dependencies
- run: |
- if [ -f Gopkg.toml ]; then
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- dep ensure
- else
- go get -v -t -d ./...
- fi
+ - name: golangci-lint
+ uses: golangci/golangci-lint-action@v3.2.0
+ with:
+ version: v1.44.2
+ args: --timeout=10m
+ skip-go-installation: true
- - name: gofmt
- run: |
- go fmt ./... && git status && [[ -z `git status -s` ]]
- # diff -u <(echo -n) <(gofmt -d -s .)
-
- - name: Install go ci lint
- run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.41.1
-
- - name: Run Linter
- run: golangci-lint run --timeout=10m -v
-
- - name: Verify
- run: |
- make verify
+ - name: gofmt
+ run: |
+ go fmt ./... && git status && [[ -z `git status -s` ]]
+ # diff -u <(echo -n) <(gofmt -d -s .)
+ - name: verify
+ run: |
+ make verify
# This step only runs when the event type is a pull_request
- - name: Integrate Test
- if: ${{ github.event_name == 'pull_request' }}
- run: |
- chmod +x integrate_test.sh && [[ -n "${{github.event.pull_request.head.repo.full_name}}" ]] && [[ -n "${{github.event.pull_request.head.sha}}" ]] && [[ -n "${{github.base_ref}}" ]] && ./integrate_test.sh ${{github.event.pull_request.head.repo.full_name}} ${{github.event.pull_request.head.sha}} ${{github.base_ref}}
+ - name: Integrate Test
+ if: ${{ github.event_name == 'pull_request' }}
+ run: |
+ chmod +x integrate_test.sh && [[ -n "${{github.event.pull_request.head.repo.full_name}}" ]] && [[ -n "${{github.event.pull_request.head.sha}}" ]] && [[ -n "${{github.base_ref}}" ]] && ./integrate_test.sh ${{github.event.pull_request.head.repo.full_name}} ${{github.event.pull_request.head.sha}} ${{github.base_ref}}
- # This step only runs when the event type is a push
- - name: Integrate Test
- if: ${{ github.event_name == 'push' }}
- run: |
- chmod +x integrate_test.sh && ./integrate_test.sh $GITHUB_REPOSITORY $GITHUB_SHA $GITHUB_BASE_REF
+ # This step only runs when the event type is a push
+ - name: Integrate Test
+ if: ${{ github.event_name == 'push' }}
+ run: |
+ chmod +x integrate_test.sh && ./integrate_test.sh $GITHUB_REPOSITORY $GITHUB_SHA $GITHUB_BASE_REF
- - name: Post Coverage
- run: bash <(curl -s https://codecov.io/bash)
-
- - name: Hello world
- run: echo Hello world ${{ secrets.DING_TOKEN }} ${{ secrets.DING_SIGN }}
-
+ - name: Post Coverage
+ run: bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/config/reference_config.go b/config/reference_config.go
index 959c356..5a975aa 100644
--- a/config/reference_config.go
+++ b/config/reference_config.go
@@ -23,15 +23,11 @@
"net/url"
"strconv"
"time"
-)
-import (
"github.com/creasty/defaults"
gxstrings "github.com/dubbogo/gost/strings"
-)
-import (
"github.com/apache/dubbo-go/cluster/directory"
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
@@ -254,7 +250,6 @@
urlMap.Set(constant.RELEASE_KEY, "dubbo-golang-"+constant.Version)
urlMap.Set(constant.SIDE_KEY, (common.RoleType(common.CONSUMER)).Role())
- urlMap.Set(constant.CATEGORY_KEY, constant.CONSUMERS_CATEGORY)
if len(c.RequestTimeout) != 0 {
urlMap.Set(constant.TIMEOUT_KEY, c.RequestTimeout)
