sync upstream

ttbadr · Jul 28, 2024 · 6b0da33 · 6b0da33
1 parent ce89791
commit 6b0da33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -3,7 +3,7 @@ name: release
 on:
   push:
     branches:
-      - master
+      - toby
 
 jobs:
   build:
@@ -28,5 +28,5 @@ jobs:
           allowUpdates: true
           tag: ${{ steps.version.outputs.VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "bin/arthas.sh,packaging/target/*.zip,packaging/target/*.tgz,packaging/target/*.deb,packaging/target/*.rpm,tunnel-server/target/*fatjar.jar"
+          artifacts: "packaging/target/*.zip,packaging/target/*.tgz,packaging/target/*.deb,packaging/target/*.rpm,tunnel-server/target/*fatjar.jar"
 
diff --git a/core/src/main/java/com/taobao/arthas/core/util/DateUtils.java b/core/src/main/java/com/taobao/arthas/core/util/DateUtils.java
@@ -2,6 +2,7 @@
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 
 /**
  * @author diecui1202 on 2017/10/25.
@@ -21,4 +22,8 @@ public static String getCurrentDateTime() {
     public static String formatDateTime(LocalDateTime dateTime) {
         return DATE_TIME_FORMATTER.format(dateTime);
     }
+
+    public static String formatDate(Date date) {
+        return DATE_TIME_FORMATTER.format(date.toInstant());
+    }
 }