From 685fd49dd772bfe02e987418c85cf43e2556f2c6 Mon Sep 17 00:00:00 2001
From: wwqgtxx <wwqgtxx@gmail.com>
Date: Wed, 1 Mar 2023 13:41:25 +0800
Subject: [PATCH] chore: better workflow

---
 .github/workflows/build.yml | 59 ++++++++++++++++++++++---------------
 Dockerfile                  |  4 ++-
 Makefile                    |  3 ++
 docker/file-name.sh         | 17 +++++------
 4 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a47ff3fab..b40d155a2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,35 +37,40 @@ jobs:
               id: "2",
             }
           - {
-              type: "WithoutCGO",
-              target: "linux-arm64 linux-mips64 linux-mips64le",
-              id: "3",
-            }
+            type: "WithoutCGO",
+            target: "linux-arm64 linux-mips64 linux-mips64le",
+            id: "3",
+          }
           - {
-              type: "WithoutCGO",
-              target: "linux-mips-softfloat linux-mips-hardfloat linux-mipsle-softfloat linux-mipsle-hardfloat",
-              id: "4",
-            }
+            type: "WithoutCGO",
+            target: "linux-mips-softfloat linux-mips-hardfloat linux-mipsle-softfloat linux-mipsle-hardfloat",
+            id: "4",
+          }
           - {
-              type: "WithoutCGO",
-              target: "freebsd-386 freebsd-amd64 freebsd-arm64",
-              id: "5",
-            }
+            type: "WithoutCGO",
+            target: "linux-386 linux-riscv64",
+            id: "5",
+          }
           - {
-              type: "WithoutCGO",
-              target: "windows-amd64-compatible windows-amd64 windows-386",
-              id: "6",
-            }
+            type: "WithoutCGO",
+            target: "freebsd-386 freebsd-amd64 freebsd-arm64",
+            id: "6",
+          }
           - {
-              type: "WithoutCGO",
-              target: "windows-arm64 windows-arm32v7",
-              id: "7",
-            }
+            type: "WithoutCGO",
+            target: "windows-amd64-compatible windows-amd64 windows-386",
+            id: "7",
+          }
           - {
-              type: "WithoutCGO",
-              target: "darwin-amd64 darwin-arm64 android-arm64",
-              id: "8",
-            }
+            type: "WithoutCGO",
+            target: "windows-arm64 windows-arm32v7",
+            id: "8",
+          }
+          - {
+            type: "WithoutCGO",
+            target: "darwin-amd64 darwin-arm64 android-arm64",
+            id: "9",
+          }
           - { type: "WithCGO", target: "windows/*", id: "1" }
           - { type: "WithCGO", target: "linux/386", id: "2" }
           - { type: "WithCGO", target: "linux/amd64", id: "3" }
@@ -193,6 +198,10 @@ jobs:
           ls -la
           cd ..
 
+      - name: Save version
+        run: echo ${VERSION} > bin/version.txt
+        shell: bash
+
       - uses: actions/upload-artifact@v3
         if: ${{  success() }}
         with:
@@ -329,5 +338,7 @@ jobs:
             linux/386
             linux/amd64
             linux/arm64/v8
+            linux/arm/v7
+          #            linux/riscv64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index 9c2e44c79..f5dcc3075 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
 FROM alpine:latest as builder
+ARG TARGETPLATFORM
+RUN echo "I'm building for $TARGETPLATFORM"
 
 RUN apk add --no-cache gzip && \
     mkdir /clash-config && \
@@ -10,7 +12,7 @@ COPY docker/file-name.sh /clash/file-name.sh
 WORKDIR /clash
 COPY bin/ bin/
 RUN FILE_NAME=`sh file-name.sh` && echo $FILE_NAME && \
-    FILE_NAME=`ls bin/ | egrep "$FILE_NAME.*"|awk NR==1` && \
+    FILE_NAME=`ls bin/ | egrep "$FILE_NAME.*"|awk NR==1` && echo $FILE_NAME && \
     mv bin/$FILE_NAME clash.gz && gzip -d clash.gz && echo "$FILE_NAME" > /clash-config/test
 FROM alpine:latest
 LABEL org.opencontainers.image.source="https://github.com/MetaCubeX/Clash.Meta"
diff --git a/Makefile b/Makefile
index f7a637a9f..ecd1f5e6c 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,9 @@ linux-mips64:
 linux-mips64le:
 	GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
+linux-riscv64:
+	GOARCH=riscv64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
+
 android-arm64:
 	GOARCH=arm64 GOOS=android $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
diff --git a/docker/file-name.sh b/docker/file-name.sh
index fb87cad01..1ac2cee0f 100644
--- a/docker/file-name.sh
+++ b/docker/file-name.sh
@@ -1,26 +1,25 @@
 #!/bin/sh
 os="clash.meta-linux-"
-arch=`uname -m`
-case $arch in 
-    "x86_64")
+case $TARGETPLATFORM in
+    "linux/amd64")
         arch="amd64-compatible"
         ;;
-    "x86")
-        arch="386-cgo"
+    "linux/386")
+        arch="386"
         ;;
-    "aarch64")
+    "linux/arm64")
         arch="arm64"
         ;;
-    "armv7l")
+    "linux/arm/v7")
         arch="armv7"
         ;;
     "riscv64")
-        arch="riscv64-cgo"
+        arch="riscv64"
         ;;
     *)
         echo "Unknown architecture"
         exit 1
         ;;        
 esac
-file_name="$os$arch"
+file_name="$os$arch-$(cat bin/version.txt)"
 echo $file_name
\ No newline at end of file