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 397f25f4a fix workflows
397f25f4a is described below
commit 397f25f4a84bc17d3761a5e76a25dc5f7e1b84fe
Author: Dan Wang <[email protected]>
AuthorDate: Fri Apr 25 15:52:20 2025 +0800
fix workflows
---
.github/workflows/build-push-env-docker.yml | 5 +++++
.github/workflows/lint_and_test_admin-cli.yml | 6 +++---
.github/workflows/lint_and_test_collector.yml | 14 +++++++++-----
.github/workflows/lint_and_test_go-client.yml | 10 ++++------
.github/workflows/lint_and_test_pegic.yml | 4 ++--
.github/workflows/regular-build.yml | 16 +++++++---------
docker/pegasus-build-env/go/Dockerfile | 2 +-
7 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/.github/workflows/build-push-env-docker.yml
b/.github/workflows/build-push-env-docker.yml
index 15416b4f0..2c504c1e0 100644
--- a/.github/workflows/build-push-env-docker.yml
+++ b/.github/workflows/build-push-env-docker.yml
@@ -102,6 +102,11 @@ jobs:
push: true
tags: |
apache/pegasus:build-env-ubuntu2204-${{ github.ref_name }}-go
+ # go-client imports thrift package of 0.13.0, so we must use
thrift-compiler 0.13.0
+ # to generate code as well. The thrift-compiler version on
ubuntu-20.04 is 0.13.0,
+ # however ubuntu-20.04 LTS runner has been retired on 2025-04-15.
Thus we choose to
+ # build thrift 0.13.0 in a image based on ubuntu-22.04 whose thrift
version is 0.16.0
+ # by default.
build-args: |
THRIFT_VERSION=0.13.0
- name: Image digest
diff --git a/.github/workflows/lint_and_test_admin-cli.yml
b/.github/workflows/lint_and_test_admin-cli.yml
index 4fef441bf..8ae651bd7 100644
--- a/.github/workflows/lint_and_test_admin-cli.yml
+++ b/.github/workflows/lint_and_test_admin-cli.yml
@@ -43,13 +43,13 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
with:
go-version: 1.18
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
- version: v1.55.2
+ version: v1.64.8
working-directory: ./admin-cli
build:
@@ -59,7 +59,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
with:
go-version: 1.18
- name: Compile
diff --git a/.github/workflows/lint_and_test_collector.yml
b/.github/workflows/lint_and_test_collector.yml
index 6fc8308c2..743d14cde 100644
--- a/.github/workflows/lint_and_test_collector.yml
+++ b/.github/workflows/lint_and_test_collector.yml
@@ -45,7 +45,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
with:
go-version: 1.18
- name: Format
@@ -57,7 +57,9 @@ jobs:
lint:
name: Lint
needs: format
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
+ container:
+ image: apache/pegasus:build-env-ubuntu2204-${{ github.ref_name }}-go
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -71,20 +73,22 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v3
with:
- version: v1.55.2
+ version: v1.64.8
working-directory: ./collector
build:
name: Build
needs: lint
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
+ container:
+ image: apache/pegasus:build-env-ubuntu2204-${{ github.ref_name }}-go
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
with:
go-version: 1.18
- name: Build
diff --git a/.github/workflows/lint_and_test_go-client.yml
b/.github/workflows/lint_and_test_go-client.yml
index 8a8916be0..54f65f9b0 100644
--- a/.github/workflows/lint_and_test_go-client.yml
+++ b/.github/workflows/lint_and_test_go-client.yml
@@ -47,7 +47,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
with:
go-version: 1.18
- name: Format
@@ -59,8 +59,6 @@ jobs:
lint:
name: Lint
needs: format
- # go-client imports thrift package of 0.13.0, so we must use
thrift-compiler 0.13.0
- # to generate code as well. The thrift-compiler version on ubuntu-20.04 is
0.13.0
runs-on: ubuntu-latest
container:
image: apache/pegasus:build-env-ubuntu2204-${{ github.ref_name }}-go
@@ -71,11 +69,11 @@ jobs:
uses: actions/setup-go@v4
with:
go-version: 1.18
- - name: Build
+ - name: Build Go Client
working-directory: ./go-client
run: make build
# because some files are generated after building, so lint after the
build step
- - name: Lint Go
+ - name: Lint Go Client
uses: golangci/golangci-lint-action@v3
with:
version: v1.64.8
@@ -120,7 +118,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
with:
go-version: 1.18
- uses: "./.github/actions/download_artifact"
diff --git a/.github/workflows/lint_and_test_pegic.yml
b/.github/workflows/lint_and_test_pegic.yml
index da94f9b4a..f72eab9f4 100644
--- a/.github/workflows/lint_and_test_pegic.yml
+++ b/.github/workflows/lint_and_test_pegic.yml
@@ -45,7 +45,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
- version: v1.55.2
+ version: v1.64.8
working-directory: ./pegic
build:
@@ -55,7 +55,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
with:
go-version: 1.18
- name: Compile
diff --git a/.github/workflows/regular-build.yml
b/.github/workflows/regular-build.yml
index 1ff13f874..bce8f8f98 100644
--- a/.github/workflows/regular-build.yml
+++ b/.github/workflows/regular-build.yml
@@ -86,16 +86,14 @@ jobs:
build_and_lint_go:
name: Build and Lint Golang
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
+ container:
+ image: apache/pegasus:build-env-ubuntu2204-${{ github.ref_name }}-go
steps:
- - name: Install thrift
- # go-client imports thrift package of 0.13.0, so we must use
thrift-compiler 0.13.0
- # to generate code as well. The thrift-compiler version on
ubuntu-20.04 is 0.13.0
- run: sudo apt-get install -y thrift-compiler
- name: Checkout
uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v4
with:
go-version: 1.18
- name: Build go-client
@@ -104,7 +102,7 @@ jobs:
- name: Lint go-client
uses: golangci/golangci-lint-action@v3
with:
- version: v1.55.2
+ version: v1.64.8
working-directory: ./go-client
- name: Build admin-cli
run: make
@@ -112,7 +110,7 @@ jobs:
- name: Lint admin-cli
uses: golangci/golangci-lint-action@v3
with:
- version: v1.55.2
+ version: v1.64.8
working-directory: ./admin-cli
- name: Build pegic
run: make
@@ -120,7 +118,7 @@ jobs:
- name: Lint pegic
uses: golangci/golangci-lint-action@v3
with:
- version: v1.55.2
+ version: v1.64.8
working-directory: ./pegic
build_java:
diff --git a/docker/pegasus-build-env/go/Dockerfile
b/docker/pegasus-build-env/go/Dockerfile
index 8780751e7..99eaec5ca 100644
--- a/docker/pegasus-build-env/go/Dockerfile
+++ b/docker/pegasus-build-env/go/Dockerfile
@@ -38,7 +38,7 @@ RUN apt-get update -y; \
unzip; \
rm -rf /var/lib/apt/lists/*
-ARG THRIFT_VERSION=0.11.0
+ARG THRIFT_VERSION=0.13.0
RUN wget --progress=dot:giga
https://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz
-P /opt/thrift && \
cd /opt/thrift && tar xzf thrift-${THRIFT_VERSION}.tar.gz && cd
thrift-${THRIFT_VERSION} && ./bootstrap.sh && \
./configure --enable-libs=no && \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
