This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch gover in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
commit 1eb4f9e22c7da7c80c503c538f4d45e6977bf965 Author: kezhenxu94 <[email protected]> AuthorDate: Tue Nov 11 10:53:53 2025 +0800 chore(deps): bump up go --- .github/workflows/compatibility.yaml | 4 ++-- .github/workflows/rover.yaml | 33 +++++++++++++-------------------- docker/Dockerfile.base | 4 ++-- go.mod | 4 +--- 4 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.github/workflows/compatibility.yaml b/.github/workflows/compatibility.yaml index 4b50f9a..c426383 100644 --- a/.github/workflows/compatibility.yaml +++ b/.github/workflows/compatibility.yaml @@ -45,10 +45,10 @@ jobs: - uses: actions/checkout@v3 with: submodules: true - - name: Set up Go 1.24 + - name: Set up Go uses: actions/setup-go@v2 with: - go-version: "1.24" + go-version: "1.25" - id: 'auth' uses: 'google-github-actions/auth@v1' with: diff --git a/.github/workflows/rover.yaml b/.github/workflows/rover.yaml index 986bec6..7cc2f20 100644 --- a/.github/workflows/rover.yaml +++ b/.github/workflows/rover.yaml @@ -15,20 +15,18 @@ # limitations under the License. name: CI - on: pull_request: - jobs: build: name: Build and Test runs-on: ubuntu-latest timeout-minutes: 60 steps: - - name: Set up Go 1.24 + - name: Set up Go uses: actions/setup-go@v2 with: - go-version: "1.24" + go-version: "1.25" - name: Check out code into the Go module directory uses: actions/checkout@v4 with: @@ -47,7 +45,6 @@ jobs: run: make linux - name: Check CI Consistency run: make check - docker: name: Docker images runs-on: ubuntu-latest @@ -65,10 +62,10 @@ jobs: with: name: docker-images-skywalking-rover path: docker-images-skywalking-rover.tar - e2e-test: name: E2E test - needs: [ docker ] + needs: + - docker runs-on: ubuntu-22.04 timeout-minutes: 60 strategy: @@ -99,7 +96,6 @@ jobs: docker: file: Dockerfile.sqrt name: test/oncpu-rust:test - - name: Golang Off CPU Profiling base: test/e2e/cases/profiling/task/offcpu/golang config: e2e.yaml @@ -124,7 +120,6 @@ jobs: docker: file: Dockerfile.file name: test/offcpu-rust:test - - name: Istio Process Finder 1.8.2 base: test/e2e/cases/process/istio config: e2e.yaml @@ -149,7 +144,6 @@ jobs: base: test/e2e/cases/process/istio config: e2e.yaml env: ISTIO_VERSION=1.13.1 - - name: Access Log base: test/e2e/cases/access_log config: e2e.yaml @@ -178,11 +172,11 @@ jobs: name: Upload Logs with: name: logs - path: "${{ env.SW_INFRA_E2E_LOG_DIR }}" - + path: ${{ env.SW_INFRA_E2E_LOG_DIR }} network-profiling-https-e2e-test-prepare: name: Prepare Network Profiling HTTPS E2E test - needs: [ docker ] + needs: + - docker runs-on: ubuntu-22.04 timeout-minutes: 60 steps: @@ -208,10 +202,10 @@ jobs: with: name: docker-images-test-nginx path: docker-images-nginx.tar - network-profiling-https-e2e-test: name: Network Profiling HTTPS E2E test - needs: [ network-profiling-https-e2e-test-prepare ] + needs: + - network-profiling-https-e2e-test-prepare runs-on: ubuntu-22.04 timeout-minutes: 60 strategy: @@ -281,11 +275,11 @@ jobs: name: Upload Logs with: name: logs - path: "${{ env.SW_INFRA_E2E_LOG_DIR }}" - + path: ${{ env.SW_INFRA_E2E_LOG_DIR }} continuous-profiling-e2e-tests: name: Continuous Profiling E2E tests - needs: [ docker ] + needs: + - docker runs-on: ubuntu-22.04 timeout-minutes: 60 strategy: @@ -343,8 +337,7 @@ jobs: name: Upload Logs with: name: logs ${{ matrix.test.name }} - path: "${{ env.SW_INFRA_E2E_LOG_DIR }}" - + path: ${{ env.SW_INFRA_E2E_LOG_DIR }} required: if: always() name: Required diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index da8ef9a..9e0a82a 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.24@sha256:ef5b4be1f94b36c90385abd9b6b4f201723ae28e71acacb76d00687333c17282 +FROM golang:1.25.2@sha256:1c91b4f4391774a73d6489576878ad3ff3161ebc8c78466ec26e83474855bfcf RUN apt update -y && apt upgrade -y && \ git clone --depth 1 --branch v1.1.0 https://github.com/libbpf/libbpf.git && \ @@ -29,4 +29,4 @@ RUN apt update -y && apt upgrade -y && \ ./llvm.sh 18 && \ apt install -y llvm-18 -ENV PATH="${PATH}:/usr/lib/llvm-18/bin" \ No newline at end of file +ENV PATH="${PATH}:/usr/lib/llvm-18/bin" diff --git a/go.mod b/go.mod index ed1fe5b..cf9c5c3 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/apache/skywalking-rover -go 1.24 - -toolchain go1.24.2 +go 1.25.2 require ( github.com/agiledragon/gomonkey/v2 v2.9.0
