This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
The following commit(s) were added to refs/heads/main by this push:
new 8a3162b chore(deps): bump up go to 1.25 (#203)
8a3162b is described below
commit 8a3162b4bf7b8ba35c5cd7a5bb03b57ab9760ea3
Author: kezhenxu94 <[email protected]>
AuthorDate: Mon Nov 24 20:59:53 2025 +0800
chore(deps): bump up go to 1.25 (#203)
---
.github/workflows/compatibility.yaml | 67 ++++++++++------------
.github/workflows/rover.yaml | 2 +-
docker/Dockerfile.base | 2 +-
docker/Dockerfile.debug | 2 +-
go.mod | 2 +-
pkg/accesslog/common/accesslog.go | 2 +-
pkg/accesslog/common/config.go | 2 +-
pkg/accesslog/common/connection.go | 2 +-
pkg/accesslog/common/filter.go | 2 +-
pkg/accesslog/common/logs.go | 2 +-
pkg/accesslog/common/queue.go | 2 +-
pkg/accesslog/common/type.go | 2 +-
pkg/profiling/continuous/checker/common/causes.go | 2 +-
pkg/profiling/continuous/checker/common/checker.go | 2 +-
.../continuous/checker/common/http_checker.go | 2 +-
.../continuous/checker/common/process_checker.go | 2 +-
.../continuous/checker/common/system_checker.go | 2 +-
scripts/build/lint.mk | 2 +-
18 files changed, 46 insertions(+), 55 deletions(-)
diff --git a/.github/workflows/compatibility.yaml
b/.github/workflows/compatibility.yaml
index b2f8b8b..0c539a6 100644
--- a/.github/workflows/compatibility.yaml
+++ b/.github/workflows/compatibility.yaml
@@ -15,7 +15,6 @@
# limitations under the License.
name: Compatibility Checks
-
# This GitHub Action aims to help to check the compatibility on the GCP
# Please provide the following data to run:
# 1. Secret.GCP_SERVICE_ACCOUNT_CREDENTIALS: The Key of the service account in
Google Cloud. The account must have been granted to operate GCloud Storage and
GCP machine instance.
@@ -23,19 +22,17 @@ name: Compatibility Checks
# 3. GCloud storage name: The name of the GCloud storage, which use to update
the checker files and check the result of compatibility.
#
# This CI costs credit on Google Cloud, we only offer this for developers to
run on your own environment.
-
on:
workflow_dispatch:
inputs:
gcloud-project:
- description: 'Which project(ID) to create GCP?'
+ description: Which project(ID) to create GCP?
type: string
required: true
gcloud-storage:
- description: 'Which GCloud Storage(Name) to storage compatibility
result?'
+ description: Which GCloud Storage(Name) to storage compatibility
result?
type: string
required: true
-
jobs:
upload-checkers:
name: Upload checkers
@@ -48,30 +45,30 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
- go-version: "1.24"
- - id: 'auth'
- uses: 'google-github-actions/auth@v1'
+ go-version: "1.25"
+ - id: auth
+ uses: google-github-actions/auth@v1
with:
- credentials_json: '${{ secrets.GCP_SERVICE_ACCOUNT_CREDENTIALS }}'
- - name: 'Set up Cloud SDK'
- uses: 'google-github-actions/setup-gcloud@v1'
+ credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT_CREDENTIALS }}
+ - name: Set up Cloud SDK
+ uses: google-github-actions/setup-gcloud@v1
- name: Build and Upload
run: |
# build skywalking rover binary
make container-btfgen build
cp bin/skywalking-rover-latest-linux-amd64 scripts/check/profiling
-
+
# build demo program
cd scripts/check/profiling
go build demo.go
mv demo demo-program
-
+
# upload to the gcloud
gcloud storage cp --project "${{ github.event.inputs.gcloud-project
}}" ./* gs://${{ github.event.inputs.gcloud-storage }}/runner
-
checks:
name: Compatibility Checks
- needs: [upload-checkers]
+ needs:
+ - upload-checkers
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
@@ -96,7 +93,6 @@ jobs:
project: ubuntu-os-cloud
family: ubuntu-2210-amd64
image: ubuntu-2210-kinetic-amd64-v20221201
-
# ubuntu pro
- name: Ubuntu_Pro
project: ubuntu-os-pro-cloud
@@ -114,7 +110,6 @@ jobs:
project: ubuntu-os-pro-cloud
family: ubuntu-pro-2204-lts
image: ubuntu-pro-2204-jammy-v20221201
-
# centos
- name: Centos
project: centos-cloud
@@ -128,7 +123,6 @@ jobs:
project: centos-cloud
family: centos-stream-9
image: centos-stream-9-v20221102
-
# debian
- name: Debian
project: debian-cloud
@@ -138,7 +132,6 @@ jobs:
project: debian-cloud
family: debian-11
image: debian-11-bullseye-v20221102
-
# RHEL
- name: RHEL
project: rhel-cloud
@@ -152,7 +145,6 @@ jobs:
project: rhel-cloud
family: rhel-9
image: rhel-9-v20221102
-
# rocky
- name: Rocky
project: rocky-linux-cloud
@@ -162,7 +154,6 @@ jobs:
project: rocky-linux-cloud
family: rocky-linux-9
image: rocky-linux-9-v20221102
-
# Fedora
- name: Fedora
project: fedora-cloud
@@ -184,44 +175,44 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- - id: 'auth'
- uses: 'google-github-actions/auth@v1'
+ - id: auth
+ uses: google-github-actions/auth@v1
with:
- credentials_json: '${{ secrets.GCP_SERVICE_ACCOUNT_CREDENTIALS }}'
- - name: 'Set up Cloud SDK'
- uses: 'google-github-actions/setup-gcloud@v1'
+ credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT_CREDENTIALS }}
+ - name: Set up Cloud SDK
+ uses: google-github-actions/setup-gcloud@v1
- name: Check
env:
- INSTANCE_PROJECT: "${{ matrix.system.project }}"
- INSTANCE_IMAGE: "${{ matrix.system.image }}"
- INSTANCE_FAMILY: "${{ matrix.system.family }}"
- INSTANCE_SYSTEM: "${{ matrix.system.name }}"
+ INSTANCE_PROJECT: ${{ matrix.system.project }}
+ INSTANCE_IMAGE: ${{ matrix.system.image }}
+ INSTANCE_FAMILY: ${{ matrix.system.family }}
+ INSTANCE_SYSTEM: ${{ matrix.system.name }}
run: |
# download the runner
mkdir -p /tmp/runner
gcloud storage cp gs://${{ github.event.inputs.gcloud-storage
}}/runner/* /tmp/runner
-
+
# create instance
gcloud compute instances create
"skywalking-rover-test-$INSTANCE_IMAGE" --image "$INSTANCE_IMAGE" \
--project "${{ github.event.inputs.gcloud-project }}"
--image-project "$INSTANCE_PROJECT" --machine-type e2-medium --zone us-west1-b
-
+
# generate the public ssh key
ssh-keygen -b 2048 -t rsa -f /tmp/sshkey -f
~/.ssh/google_compute_engine -q -N ""
-
+
# scp runner
gcloud compute scp --recurse /tmp/runner
test@"skywalking-rover-test-$INSTANCE_IMAGE":/tmp/ \
- --zone us-west1-b --project "${{
github.event.inputs.gcloud-project }}"
-
+ --zone us-west1-b --project "${{
github.event.inputs.gcloud-project }}"
+
# run checker
gcloud compute ssh --zone "us-west1-b"
"test@skywalking-rover-test-$INSTANCE_IMAGE" \
--project "${{ github.event.inputs.gcloud-project }}" \
--command "cd /tmp/runner; chmod +x /tmp/runner/demo-program
/tmp/runner/skywalking-rover-latest-linux-amd64; sudo bash check.sh
/tmp/runner/config.yaml /tmp/runner/demo-program
/tmp/runner/skywalking-rover-latest-linux-amd64
/tmp/runner/result/$INSTANCE_SYSTEM/$INSTANCE_FAMILY json"
-
+
# scp from instance and upload to the storage
gcloud compute scp --recurse
test@"skywalking-rover-test-$INSTANCE_IMAGE":/tmp/runner/result /tmp/runner \
- --zone us-west1-b --project "${{
github.event.inputs.gcloud-project }}"
+ --zone us-west1-b --project "${{
github.event.inputs.gcloud-project }}"
gcloud storage cp -r /tmp/runner/result gs://"${{
github.event.inputs.gcloud-storage }}"/ \
- --project "${{ github.event.inputs.gcloud-project }}"
+ --project "${{ github.event.inputs.gcloud-project }}"
# delete test instance
gcloud compute instances delete --project "${{
github.event.inputs.gcloud-project }}" "skywalking-rover-test-$INSTANCE_IMAGE"
--zone us-west1-b -q
diff --git a/.github/workflows/rover.yaml b/.github/workflows/rover.yaml
index ba1467b..7cc2f20 100644
--- a/.github/workflows/rover.yaml
+++ b/.github/workflows/rover.yaml
@@ -26,7 +26,7 @@ jobs:
- 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:
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index ef7d7e8..fa3fde8 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.8@sha256:273d4e65baa782dbe293c9192d600b72b17d415c1429e16bed99efcc5e61efb8
+FROM golang:1.25
RUN apt update -y && apt upgrade -y && \
git clone --depth 1 --branch v1.1.0 https://github.com/libbpf/libbpf.git
&& \
diff --git a/docker/Dockerfile.debug b/docker/Dockerfile.debug
index 233ab94..7a88a92 100644
--- a/docker/Dockerfile.debug
+++ b/docker/Dockerfile.debug
@@ -15,7 +15,7 @@
# limitations under the License.
ARG BASE_IMAGE=apache/skywalking-rover:latest
-FROM $BASE_IMAGE as build
+FROM $BASE_IMAGE AS build
ARG VERSION="latest"
diff --git a/go.mod b/go.mod
index f145619..888ad6f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-rover
-go 1.24.8
+go 1.25
require (
github.com/agiledragon/gomonkey/v2 v2.9.0
diff --git a/pkg/accesslog/common/accesslog.go
b/pkg/accesslog/common/accesslog.go
index 63f4c76..00fa0d3 100644
--- a/pkg/accesslog/common/accesslog.go
+++ b/pkg/accesslog/common/accesslog.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"context"
diff --git a/pkg/accesslog/common/config.go b/pkg/accesslog/common/config.go
index 0298088..6e05b3d 100644
--- a/pkg/accesslog/common/config.go
+++ b/pkg/accesslog/common/config.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import "github.com/apache/skywalking-rover/pkg/module"
diff --git a/pkg/accesslog/common/connection.go
b/pkg/accesslog/common/connection.go
index b67461f..b00ffab 100644
--- a/pkg/accesslog/common/connection.go
+++ b/pkg/accesslog/common/connection.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"context"
diff --git a/pkg/accesslog/common/filter.go b/pkg/accesslog/common/filter.go
index 34baee3..f2eb2bb 100644
--- a/pkg/accesslog/common/filter.go
+++ b/pkg/accesslog/common/filter.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"os"
diff --git a/pkg/accesslog/common/logs.go b/pkg/accesslog/common/logs.go
index 3355941..b50f7a7 100644
--- a/pkg/accesslog/common/logs.go
+++ b/pkg/accesslog/common/logs.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"github.com/apache/skywalking-rover/pkg/accesslog/events"
diff --git a/pkg/accesslog/common/queue.go b/pkg/accesslog/common/queue.go
index b4a9cd0..5c3fc57 100644
--- a/pkg/accesslog/common/queue.go
+++ b/pkg/accesslog/common/queue.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"context"
diff --git a/pkg/accesslog/common/type.go b/pkg/accesslog/common/type.go
index 53f288f..bb8b743 100644
--- a/pkg/accesslog/common/type.go
+++ b/pkg/accesslog/common/type.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
type LogType int
diff --git a/pkg/profiling/continuous/checker/common/causes.go
b/pkg/profiling/continuous/checker/common/causes.go
index e9a1a70..7438377 100644
--- a/pkg/profiling/continuous/checker/common/causes.go
+++ b/pkg/profiling/continuous/checker/common/causes.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"github.com/apache/skywalking-rover/pkg/process/api"
diff --git a/pkg/profiling/continuous/checker/common/checker.go
b/pkg/profiling/continuous/checker/common/checker.go
index 1993f2e..263976c 100644
--- a/pkg/profiling/continuous/checker/common/checker.go
+++ b/pkg/profiling/continuous/checker/common/checker.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"github.com/apache/skywalking-rover/pkg/logger"
diff --git a/pkg/profiling/continuous/checker/common/http_checker.go
b/pkg/profiling/continuous/checker/common/http_checker.go
index 6e1e6e7..0dec2f7 100644
--- a/pkg/profiling/continuous/checker/common/http_checker.go
+++ b/pkg/profiling/continuous/checker/common/http_checker.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"regexp"
diff --git a/pkg/profiling/continuous/checker/common/process_checker.go
b/pkg/profiling/continuous/checker/common/process_checker.go
index 8298506..f859999 100644
--- a/pkg/profiling/continuous/checker/common/process_checker.go
+++ b/pkg/profiling/continuous/checker/common/process_checker.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"fmt"
diff --git a/pkg/profiling/continuous/checker/common/system_checker.go
b/pkg/profiling/continuous/checker/common/system_checker.go
index 1b9475f..79597ea 100644
--- a/pkg/profiling/continuous/checker/common/system_checker.go
+++ b/pkg/profiling/continuous/checker/common/system_checker.go
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package common
+package common //nolint:revive // package name is acceptable in this context
import (
"fmt"
diff --git a/scripts/build/lint.mk b/scripts/build/lint.mk
index d7b5a1e..66f4e12 100644
--- a/scripts/build/lint.mk
+++ b/scripts/build/lint.mk
@@ -19,7 +19,7 @@
GO_LINT = $(GO_PATH)/bin/golangci-lint
linter:
- $(GO_LINT) version || curl -sfL
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh
-s -- -b $(GO_PATH)/bin v2.1.6
+ $(GO_LINT) version || curl -sfL
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh
-s -- -b $(GO_PATH)/bin v2.4.0
.PHONY: lint
lint: linter generate
