2024-05-24_03

ZxwyWebSite · May 24, 2024 · da102b9 · da102b9
1 parent 9f65a16
commit da102b9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -30,7 +30,7 @@ jobs:
           sudo apt-get -y install gcc-mingw-w64-x86-64
           sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
           sudo apt-get -y install gcc-aarch64-linux-gnu libc6-dev-arm64-cross
-          wget https://dl.google.com/android/repository/android-ndk-r26b-linux.zip && unzip android-ndk-r26b-linux.zip && rm android-ndk-r26b-linux.zip
+          wget -q https://dl.google.com/android/repository/android-ndk-r26b-linux.zip && unzip -d ~ android-ndk-r26b-linux.zip && rm android-ndk-r26b-linux.zip
 
       # - name: Fetch zTool
       #   run: wget "https://r2eu.zxwy.link/gh/lx-source/statics/ztool-20240323.zip" -O ../ztool.zip && cd ../ && unzip ztool.zip
@@ -40,7 +40,7 @@ jobs:
         run: cd repo && go run action.go && mv dist ../
 
       - name: Short SHA
-        uses: benjlevesque/short-sha@v2.2
+        uses: benjlevesque/short-sha@v3.0
         id: short-sha
 
       - name: Upload artifact

diff --git a/action.go b/action.go
@@ -20,6 +20,7 @@ const (
 	args_path = `dist/`     // 输出目录
 	args_zpak = true        // 打包文件
 	// args_repo = `repo/`     // 源码目录
+	args_home = `/home/runner` // 用户目录
 )
 
 var workDir string
@@ -147,39 +148,39 @@ func main() {
 				`android`: {
 					Arch: list_arch{
 						`amd64`: {
-							AR:  workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar`,
-							CC:  workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang`,
-							CXX: workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang++`,
+							AR:  args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar`,
+							CC:  args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang`,
+							CXX: args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang++`,
 							Vers: list_vers{
 								``: {
 									Tags: `go_json`,
 								},
 							},
 						},
 						`arm64`: {
-							AR:  workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar`,
-							CC:  workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang`,
-							CXX: workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++`,
+							AR:  args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar`,
+							CC:  args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang`,
+							CXX: args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++`,
 							Vers: list_vers{
 								``: {
 									Tags: `go_json`,
 								},
 							},
 						},
 						`386`: {
-							AR:  workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar`,
-							CC:  workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android24-clang`,
-							CXX: workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android24-clang++`,
+							AR:  args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar`,
+							CC:  args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android24-clang`,
+							CXX: args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android24-clang++`,
 							Vers: list_vers{
 								``: {
 									Tags: `go_json`,
 								},
 							},
 						},
 						`arm`: {
-							AR:  workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar`,
-							CC:  workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang`,
-							CXX: workDir + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++`,
+							AR:  args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar`,
+							CC:  args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang`,
+							CXX: args_home + `/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++`,
 							Vers: list_vers{
 								``: {
 									Tags: `go_json`,
@@ -200,7 +201,7 @@ func main() {
 				// },
 			},
 		},
-		`/home/runner/go/bin/go1.20.14`: {
+		args_home + `/go/bin/go1.20.14`: {
 			Args: def_args,
 			GoOS: list_goos{
 				`windows`: {