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 ce62e148fbcbb4c31090172a4798f526ed16c0eb Author: kezhenxu94 <[email protected]> AuthorDate: Tue Nov 11 10:53:53 2025 +0800 chore(deps): bump up go --- .github/workflows/compatibility.yaml | 83 ++++++++++-------------------------- .github/workflows/rover.yaml | 33 ++++++-------- docker/Dockerfile.base | 4 +- go.mod | 4 +- 4 files changed, 39 insertions(+), 85 deletions(-) diff --git a/.github/workflows/compatibility.yaml b/.github/workflows/compatibility.yaml index 4b50f9a..33ba282 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 @@ -45,33 +42,33 @@ 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" - - 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,16 @@ 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 }}" - 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 }}" - - # 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 }}" - gcloud storage cp -r /tmp/runner/result gs://"${{ github.event.inputs.gcloud-storage }}"/ \ - --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 + INSTANCE_PROJECT: ${{ matrix.system.project }} + INSTANCE_IMAGE: ${{ matrix.system.image }} + INSTANCE_FAMILY: ${{ matrix.system.family }} + INSTANCE_SYSTEM: ${{ matrix.system.name }} + run: "# download the runner\nmkdir -p /tmp/runner\ngcloud storage cp gs://${{ github.event.inputs.gcloud-storage }}/runner/* /tmp/runner\n\n# create instance\ngcloud compute instances create \"skywalking-rover-test-$INSTANCE_IMAGE\" --image \"$INSTANCE_IMAGE\" \\\n\t--project \"${{ github.event.inputs.gcloud-project }}\" --image-project \"$INSTANCE_PROJECT\" --machine-type e2-medium --zone us-west1-b\n\n# generate the public ssh key\nssh-keygen -b 2048 -t rsa -f /tmp/sshkey -f ~/ [...] 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
