diff --git a/.gitea/workflows/job_lint.yml b/.gitea/workflows/job_lint.yml deleted file mode 100644 index d97e747..0000000 --- a/.gitea/workflows/job_lint.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: lint - -on: - pull_request: - types: [opened, reopened, synchronize] - branches: - - master - - v3 - - v4 - -jobs: - lint: - runs-on: ubuntu-latest - steps: - - name: checkout code - uses: actions/checkout@v4 - with: - filter: 'blob:none' - - name: setup go - uses: actions/setup-go@v5 - with: - cache-dependency-path: "**/*.sum" - go-version: 'stable' - - name: setup deps - run: go get -v ./... - - name: run lint - uses: https://github.com/golangci/golangci-lint-action@v6 - with: - version: 'latest' diff --git a/.gitea/workflows/job_tests.yml b/.gitea/workflows/job_tests.yml deleted file mode 100644 index e911576..0000000 --- a/.gitea/workflows/job_tests.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: test - -on: - pull_request: - types: [opened, reopened, synchronize] - branches: - - master - - v3 - - v4 - push: - branches: - - master - - v3 - - v4 - -jobs: - test: - runs-on: ubuntu-latest - steps: - - name: checkout code - uses: actions/checkout@v4 - with: - filter: 'blob:none' - - name: checkout tests - uses: actions/checkout@v4 - with: - ref: master - filter: 'blob:none' - repository: unistack-org/micro-tests - path: micro-tests - - name: setup go - uses: actions/setup-go@v5 - with: - cache-dependency-path: "**/*.sum" - go-version: 'stable' - - name: setup go work - env: - GOWORK: /workspace/${{ github.repository_owner }}/go.work - run: | - go work init - go work use . - go work use micro-tests - - name: setup deps - env: - GOWORK: /workspace/${{ github.repository_owner }}/go.work - run: go get -v ./... - - name: run tests - env: - INTEGRATION_TESTS: yes - GOWORK: /workspace/${{ github.repository_owner }}/go.work - run: | - cd micro-tests - go test -mod readonly -v ./... || true diff --git a/.gitea/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from .gitea/ISSUE_TEMPLATE/bug_report.md rename to .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.gitea/ISSUE_TEMPLATE/feature-request---enhancement.md b/.github/ISSUE_TEMPLATE/feature-request---enhancement.md similarity index 100% rename from .gitea/ISSUE_TEMPLATE/feature-request---enhancement.md rename to .github/ISSUE_TEMPLATE/feature-request---enhancement.md diff --git a/.gitea/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md similarity index 100% rename from .gitea/ISSUE_TEMPLATE/question.md rename to .github/ISSUE_TEMPLATE/question.md diff --git a/.gitea/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from .gitea/PULL_REQUEST_TEMPLATE.md rename to .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/workflows/job_lint.yml b/.github/workflows/job_lint.yml new file mode 100644 index 0000000..c1c8e47 --- /dev/null +++ b/.github/workflows/job_lint.yml @@ -0,0 +1,29 @@ +name: lint + +on: + pull_request: + types: [opened, reopened, synchronize] + branches: + - master + - v3 + - v4 + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v4 + with: + filter: 'blob:none' + - name: setup go + uses: actions/setup-go@v5 + with: + cache-dependency-path: "**/*.sum" + go-version: 'stable' + - name: setup deps + run: go get -v ./... + - name: run lint + uses: golangci/golangci-lint-action@v6 + with: + version: 'latest' diff --git a/.gitea/workflows/job_test.yml b/.github/workflows/job_test.yml similarity index 100% rename from .gitea/workflows/job_test.yml rename to .github/workflows/job_test.yml diff --git a/.github/workflows/job_tests.yml b/.github/workflows/job_tests.yml new file mode 100644 index 0000000..4072ee6 --- /dev/null +++ b/.github/workflows/job_tests.yml @@ -0,0 +1,53 @@ +name: test + +on: + pull_request: + types: [opened, reopened, synchronize] + branches: + - master + - v3 + - v4 + push: + branches: + - master + - v3 + - v4 + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: checkout code + uses: actions/checkout@v4 + with: + filter: 'blob:none' + - name: checkout tests + uses: actions/checkout@v4 + with: + ref: master + filter: 'blob:none' + repository: unistack-org/micro-tests + path: micro-tests + - name: setup go + uses: actions/setup-go@v5 + with: + cache-dependency-path: "**/*.sum" + go-version: 'stable' + - name: setup go work + env: + GOWORK: ${{ github.workspace }}/go.work + run: | + go work init + go work use . + go work use micro-tests + - name: setup deps + env: + GOWORK: ${{ github.workspace }}/go.work + run: go get -v ./... + - name: run tests + env: + INTEGRATION_TESTS: yes + GOWORK: ${{ github.workspace }}/go.work + run: | + cd micro-tests + go test -mod readonly -v ./... || true diff --git a/.golangci.yml b/.golangci.yml index 2bb1c30..c6a7985 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,5 @@ run: concurrency: 8 - deadline: 5m + timeout: 5m issues-exit-code: 1 tests: true diff --git a/go.mod b/go.mod index defa97b..54b2b32 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,11 @@ module go.unistack.org/micro-server-grpc/v3 -go 1.22.0 +go 1.22.2 +toolchain go1.24.2 require ( - go.unistack.org/micro/v3 v3.11.30 + go.unistack.org/micro/v3 v3.11.41 golang.org/x/net v0.33.0 google.golang.org/grpc v1.69.2 google.golang.org/protobuf v1.36.1 diff --git a/go.sum b/go.sum index 47e3cc3..89e8359 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,8 @@ go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HY go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q= go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo= -go.unistack.org/micro/v3 v3.11.30 h1:XTLgZubSGzQL85IUMp1pTJnS1lP4eFwTZyelV/SzOMc= -go.unistack.org/micro/v3 v3.11.30/go.mod h1:fvOkXKs3wKHToWH6Mxy+aovEiDl2q4UlOCdVfJdziBU= +go.unistack.org/micro/v3 v3.11.41 h1:dP4sBLIZpMo+MWGe5bbESewK8wBzYm4Yik/67x4dEtQ= +go.unistack.org/micro/v3 v3.11.41/go.mod h1:POGU5hstnAT9LH70m8FalyQSNi2GfIew71K75JenIZk= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=