This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch fix-github-ubuntu-2004-runner-removed
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to
refs/heads/fix-github-ubuntu-2004-runner-removed by this push:
new 0cb4a853e refactor and add collector into regular build
0cb4a853e is described below
commit 0cb4a853ed8ba1e62b6d2ae4d33f7a564337d5d5
Author: Dan Wang <[email protected]>
AuthorDate: Fri Apr 25 19:37:29 2025 +0800
refactor and add collector into regular build
---
.github/workflows/lint_and_test_admin-cli.yml | 6 +++---
.github/workflows/lint_and_test_collector.yml | 4 ++--
.github/workflows/lint_and_test_go-client.yml | 6 +++---
.github/workflows/lint_and_test_pegic.yml | 6 +++---
.github/workflows/regular-build.yml | 10 +++++++++-
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/lint_and_test_admin-cli.yml
b/.github/workflows/lint_and_test_admin-cli.yml
index 68e42768c..f17f141e2 100644
--- a/.github/workflows/lint_and_test_admin-cli.yml
+++ b/.github/workflows/lint_and_test_admin-cli.yml
@@ -43,11 +43,11 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- - name: Set up Go
+ - name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
- - name: golangci-lint
+ - name: Lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.56.2
@@ -59,7 +59,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- - name: Set up Go
+ - name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
diff --git a/.github/workflows/lint_and_test_collector.yml
b/.github/workflows/lint_and_test_collector.yml
index 9fbbf252b..41a089144 100644
--- a/.github/workflows/lint_and_test_collector.yml
+++ b/.github/workflows/lint_and_test_collector.yml
@@ -65,7 +65,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1
- - name: Set up Go
+ - name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
@@ -87,7 +87,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1
- - name: Set up Go
+ - name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
diff --git a/.github/workflows/lint_and_test_go-client.yml
b/.github/workflows/lint_and_test_go-client.yml
index 045c87f65..19a3260af 100644
--- a/.github/workflows/lint_and_test_go-client.yml
+++ b/.github/workflows/lint_and_test_go-client.yml
@@ -69,11 +69,11 @@ jobs:
uses: actions/setup-go@v4
with:
go-version: 1.18
- - name: Build Go Client
+ - name: Build
working-directory: ./go-client
run: make build
# because some files are generated after building, so lint after the
build step
- - name: Lint Go Client
+ - name: Lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.56.2
@@ -117,7 +117,7 @@ jobs:
cd - && rm -rf thrift-${THRIFT_VERSION} v${THRIFT_VERSION}.tar.gz
- name: Checkout
uses: actions/checkout@v4
- - name: Set up Go
+ - name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
diff --git a/.github/workflows/lint_and_test_pegic.yml
b/.github/workflows/lint_and_test_pegic.yml
index a407a92c0..3cff3c1c5 100644
--- a/.github/workflows/lint_and_test_pegic.yml
+++ b/.github/workflows/lint_and_test_pegic.yml
@@ -43,11 +43,11 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- - name: Set up Go
+ - name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
- - name: golangci-lint
+ - name: Lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.56.2
@@ -59,7 +59,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- - name: Set up Go
+ - name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
diff --git a/.github/workflows/regular-build.yml
b/.github/workflows/regular-build.yml
index 3eac91eb2..05fa904c8 100644
--- a/.github/workflows/regular-build.yml
+++ b/.github/workflows/regular-build.yml
@@ -92,7 +92,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- - name: Set up Go
+ - name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.18
@@ -104,6 +104,14 @@ jobs:
with:
version: v1.56.2
working-directory: ./go-client
+ - name: Build collector
+ run: make
+ working-directory: ./collector
+ - name: Lint collector
+ uses: golangci/golangci-lint-action@v3
+ with:
+ version: v1.56.2
+ working-directory: ./collector
- name: Build admin-cli
run: make
working-directory: ./admin-cli
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
