pull from upstream

.github/workflows/build-async-profiler.yml

@@ -25,26 +25,26 @@ jobs:
         with:
           distribution: "liberica"
           java-version: "11"
-      # 从 async-profiler 源码编译出 libasyncProfiler-mac.so(兼容 arthas-core 中 ProfilerCommand.java 固定的 so 文件名称未使用 libasyncProfiler.dylib)
+      # 从 async-profiler 源码编译出 libasyncProfiler-mac.dylib(兼容 arthas-core 中 ProfilerCommand.java 固定的 so 文件名称未使用 libasyncProfiler.dylib)
       # grep -m1 PROFILER_VERSION Makefile 用于输出 async-profiler 版本, 下同
       - name: Execute compile inside macOS 12 environment
         run: |
           grep -m1 PROFILER_VERSION Makefile
           echo "JAVA_HOME=${JAVA_HOME}"
           java -version
-          echo "FAT_BINARY variable that make libasyncProfiler-mac.so works both on macOS x86-64 and arm64"
+          echo "FAT_BINARY variable that make libasyncProfiler-mac.dylib works both on macOS x86-64 and arm64"
           make FAT_BINARY=true
           LIB_PROFILER_PATH=$(find build -type f \( -name libasyncProfiler.so -o -name libasyncProfiler.dylib \) 2>/dev/null)
           [ -z "${LIB_PROFILER_PATH}" ] && echo "Can not find libasyncProfiler.so or libasyncProfiler.dylib file under build directory." && exit 1
           echo "LIB_PROFILER_PATH=${LIB_PROFILER_PATH}"
           file ${LIB_PROFILER_PATH}
           otool -L ${LIB_PROFILER_PATH}
-          cp ${LIB_PROFILER_PATH} libasyncProfiler-mac.so
-      # 暂存编译出来的 libasyncProfiler-mac.so 文件
+          cp ${LIB_PROFILER_PATH} libasyncProfiler-mac.dylib
+      # 暂存编译出来的 libasyncProfiler-mac.dylib 文件
       - uses: actions/upload-artifact@v3
         with:
           name: async-profiler
-          path: libasyncProfiler-mac.so
+          path: libasyncProfiler-mac.dylib
           if-no-files-found: error
 
   build-generic-linux-x64:
@@ -143,89 +143,6 @@ jobs:
           if-no-files-found: error
 
 
-  build-alpine-linux-x64:
-    runs-on: ubuntu-20.04
-    if: ${{ inputs.async-profiler-tag-name }}
-    steps:
-      # 检出 async-profiler/async-profiler 项目指定的 tag
-      - uses: actions/checkout@v3
-        with:
-          repository: async-profiler/async-profiler
-          fetch-depth: 0
-      - name: Checkout the async-profiler repository by input tag name ${{ inputs.async-profiler-tag-name }}
-        run: git checkout ${{ inputs.async-profiler-tag-name }}
-      - name: Setup Alpine Linux x86-64 environment
-        uses: jirutka/setup-alpine@v1
-        with:
-          arch: x86_64
-          branch: v3.15
-          shell-name: alpine-x86_64.sh
-          packages: >
-            build-base linux-headers openjdk11
-      # 从 async-profiler 源码编译出适用于 musl-based Linux 主机的 libasyncProfiler-linux-musl-x64.so
-      # grep -m1 PROFILER_VERSION Makefile 用于输出 async-profiler 版本, 下同
-      - name: Run script inside Alpine Linux x86-64 environment
-        run: |
-          grep -m1 PROFILER_VERSION Makefile
-          JAVA_HOME=/usr/lib/jvm/java-11-openjdk
-          java -version
-          which java
-          echo "Append -static-libgcc -static-libstdc++ options to CXXFLAGS for user no need to install libstdc++ and libgcc manually."
-          sed -i 's/CXXFLAGS=/CXXFLAGS=-static-libgcc -static-libstdc++ /' Makefile && make
-          LIB_PROFILER_PATH=$(find build -type f -name libasyncProfiler.so 2>/dev/null)
-          [ -z "${LIB_PROFILER_PATH}" ] && echo "Can not find libasyncProfiler.so file under build directory." && exit 1
-          echo "LIB_PROFILER_PATH=${LIB_PROFILER_PATH}"
-          file ${LIB_PROFILER_PATH}
-          ldd ${LIB_PROFILER_PATH}
-          cp ${LIB_PROFILER_PATH} libasyncProfiler-linux-musl-x64.so
-        shell: alpine-x86_64.sh {0}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: async-profiler
-          path: libasyncProfiler-linux-musl-x64.so
-          if-no-files-found: error
-
-  build-alpine-linux-arm64:
-    runs-on: ubuntu-20.04
-    if: ${{ inputs.async-profiler-tag-name }}
-    steps:
-      # 检出 async-profiler/async-profiler 项目指定的 tag
-      - uses: actions/checkout@v3
-        with:
-          repository: async-profiler/async-profiler
-          fetch-depth: 0
-      - name: Checkout the async-profiler repository by input tag name ${{ inputs.async-profiler-tag-name }}
-        run: git checkout ${{ inputs.async-profiler-tag-name }}
-      - name: Setup Alpine Linux aarch64 environment
-        uses: jirutka/setup-alpine@v1
-        with:
-          arch: aarch64
-          branch: v3.15
-          shell-name: alpine-aarch64.sh
-          packages: >
-            build-base linux-headers openjdk11
-      # 从 async-profiler 源码编译出适用于 musl-based Linux 主机的 libasyncProfiler-linux-musl-arm64.so
-      # grep -m1 PROFILER_VERSION Makefile 用于输出 async-profiler 版本, 下同
-      - name: Run script inside Alpine Linux aarch64 environment
-        run: |
-          grep -m1 PROFILER_VERSION Makefile
-          JAVA_HOME=/usr/lib/jvm/java-11-openjdk
-          java -version
-          which java
-          echo "Append -static-libgcc -static-libstdc++ options to CXXFLAGS for user no need to install libstdc++ and libgcc manually."
-          sed -i 's/CXXFLAGS=/CXXFLAGS=-static-libgcc -static-libstdc++ /' Makefile && make
-          LIB_PROFILER_PATH=$(find build -type f -name libasyncProfiler.so 2>/dev/null)
-          [ -z "${LIB_PROFILER_PATH}" ] && echo "Can not find libasyncProfiler.so file under build directory." && exit 1
-          echo "LIB_PROFILER_PATH=${LIB_PROFILER_PATH}"
-          file ${LIB_PROFILER_PATH}
-          ldd ${LIB_PROFILER_PATH}
-          cp ${LIB_PROFILER_PATH} libasyncProfiler-linux-musl-arm64.so
-        shell: alpine-aarch64.sh {0}
-      - uses: actions/upload-artifact@v3
-        with:
-          name: async-profiler
-          path: libasyncProfiler-linux-musl-arm64.so
-          if-no-files-found: error
 
   upload-libasyncProfiler-files:
     runs-on: ubuntu-20.04

.github/workflows/build-vmtool.yaml

@@ -14,7 +14,7 @@ jobs:
           java-version: '8'
           distribution: 'adopt'
       - name: Build with Maven
-        run: ./mvnw package
+        run: ./mvnw -V -ntp package
       - uses: actions/upload-artifact@v3
         with:
           name: lib
@@ -30,7 +30,7 @@ jobs:
           java-version: '8'
           distribution: 'adopt'
       - name: Build with Maven
-        run: ./mvnw package
+        run: ./mvnw -V -ntp package
       - uses: actions/upload-artifact@v3
         with:
           name: lib
@@ -46,7 +46,7 @@ jobs:
           java-version: '8'
           distribution: 'adopt'
       - name: Build with Maven
-        run: ./mvnw package
+        run: ./mvnw -V -ntp package
       - uses: actions/upload-artifact@v3
         with:
           name: lib
@@ -73,7 +73,7 @@ jobs:
 
           run: |
             apt update && apt install openjdk-8-jdk g++ -y
-            ./mvnw package -pl common,arthas-vmtool
+            ./mvnw -V -ntp package -pl common,arthas-vmtool
             cp arthas-vmtool/target/libArthas* lib/
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/push-docker.yaml

@@ -0,0 +1,34 @@
+name: Push arthas images to Docker Hub
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "The version number to push (e.g., 4.0.3)"
+        required: true
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 步骤 1：检出 master 分支的代码
+      - name: Checkout gh-pages branch
+        uses: actions/checkout@v3
+        with:
+          ref: master
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build Docker image
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          docker buildx build . --build-arg ARTHAS_VERSION=$VERSION --build-arg MIRROR=true -t hengyunabc/arthas:$VERSION  -t hengyunabc/arthas:latest --platform=linux/arm64,linux/amd64 --push
+          docker buildx build .  --build-arg ARTHAS_VERSION=$VERSION   --build-arg MIRROR=true -f Dockerfile-No-Jdk -t hengyunabc/arthas:$VERSION-no-jdk --platform=linux/arm64,linux/amd64  --push

.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
           java-version: '8'
           distribution: 'adopt'
       - name: Build with Maven
-        run: mvn clean package -P full
+        run: mvn -V -ntp clean package -P full
 
       - name: Release
         uses: softprops/action-gh-release@v1

.github/workflows/test.yaml

@@ -17,7 +17,7 @@ jobs:
           distribution: 'zulu'
           cache: 'maven'
       - name: Build with Maven
-        run: mvn clean install -P full
+        run: mvn -V -ntp clean install -P full
 
   windows_build:
     runs-on: windows-2019
@@ -33,7 +33,7 @@ jobs:
           distribution: 'zulu'
           cache: 'maven'
       - name: Build with Maven
-        run: mvn clean install -P full
+        run: mvn -V -ntp clean install -P full
 
   macos_build:
     runs-on: ${{ matrix.os }}
@@ -52,4 +52,4 @@ jobs:
           distribution: 'zulu'
           cache: 'maven'
       - name: Build with Maven
-        run: mvn clean install -P full
+        run: mvn -V -ntp clean install -P full

.github/workflows/update-doc.yaml

@@ -0,0 +1,80 @@
+name: Update docs on gh-pages
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "The version number to download and update (e.g., 4.0.3)"
+        required: true
+
+jobs:
+  update-assets:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 步骤 1：检出 gh-pages 分支的代码
+      - name: Checkout gh-pages branch
+        uses: actions/checkout@v3
+        with:
+          ref: gh-pages
+
+      # 步骤 2：下载指定版本的文档 ZIP 文件到 /tmp 目录
+      - name: Download documentation ZIP file
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          DOC_DOWNLOAD_URL="https://repo1.maven.org/maven2/com/taobao/arthas/arthas-packaging/${VERSION}/arthas-packaging-${VERSION}-doc.zip"
+          echo "Downloading documentation from $DOC_DOWNLOAD_URL"
+          curl -L "$DOC_DOWNLOAD_URL" -o "/tmp/arthas-doc.zip"
+
+      # 步骤 3：解压文档 ZIP 文件
+      - name: Unzip documentation file
+        run: |
+          unzip -o /tmp/arthas-doc.zip -d /tmp/arthas-doc
+
+      # 步骤 4：删除仓库中的 assets 目录
+      - name: Remove assets directory
+        run: |
+          rm -rf assets
+
+      # 步骤 5：复制解压后的文档文件到仓库
+      - name: Copy documentation files to repository
+        run: |
+          cp -r /tmp/arthas-doc/* ./
+
+      # 步骤 6：下载指定版本的二进制 ZIP 文件到 /tmp 目录
+      - name: Download binary ZIP file
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          BIN_DOWNLOAD_URL="https://repo1.maven.org/maven2/com/taobao/arthas/arthas-packaging/${VERSION}/arthas-packaging-${VERSION}-bin.zip"
+          echo "Downloading binary files from $BIN_DOWNLOAD_URL"
+          curl -L "$BIN_DOWNLOAD_URL" -o "/tmp/arthas-bin.zip"
+
+      # 步骤 7：解压二进制 ZIP 文件
+      - name: Unzip binary file
+        run: |
+          unzip -o /tmp/arthas-bin.zip -d /tmp/arthas-bin
+
+      # 步骤 8：复制指定文件到仓库目录
+      - name: Copy binary files to repository
+        run: |
+          cp /tmp/arthas-bin/as.sh ./
+          cp /tmp/arthas-bin/arthas-boot.jar ./
+          cp /tmp/arthas-bin/math-game.jar ./
+
+      # 步骤 9：赋予 as.sh 可执行权限
+      - name: Make as.sh executable
+        run: |
+          chmod +x as.sh
+
+      # 步骤 10：设置 Git 用户信息
+      - name: Set Git user
+        run: |
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
+
+      # 步骤 11：提交并推送更改到远程仓库
+      - name: Commit and push changes
+        run: |
+          git add .
+          git commit -m "Update docs to version ${{ github.event.inputs.version }}"
+          git push origin gh-pages