From 0b85efded3662334b2f108aba44190e3ac384f10 Mon Sep 17 00:00:00 2001
From: e1732a364fed <75717694+e1732a364fed@users.noreply.github.com>
Date: Sat, 1 Jan 2000 00:00:00 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BC=96=E8=AF=91=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6;=E5=89=8D=E4=B8=80commit=E8=AF=95=E5=9B=BE=E9=87=87?=
 =?UTF-8?q?=E7=94=A8uraimo/run-on-arch-action@v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build_release_extra.yml |  4 +++-
 cmd/verysimple/Makefile_r_vsc             | 21 +++------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build_release_extra.yml b/.github/workflows/build_release_extra.yml
index e840355..922be23 100644
--- a/.github/workflows/build_release_extra.yml
+++ b/.github/workflows/build_release_extra.yml
@@ -26,10 +26,12 @@ jobs:
 
           githubToken: ${{ github.token }}
 
+          install: |
+            apt-get update -q -y
+            apt-get install -q -y build-essential libgtk-3-dev
           run: |
             uname -a
             echo ::set-output name=uname::$(uname -a)
-            sudo apt-get install build-essential libgtk-3-dev
             cd cmd/verysimple/ && make -f Makefile_r_vsc PACKNAME=vs_gui_ubuntu_arm64 BUILD_VERSION=${{ github.event.inputs.tagName }} && touch -mt $(date +%Y01010000) *.tar.xz
 
       - name: Upload binaries to release
diff --git a/cmd/verysimple/Makefile_r_vsc b/cmd/verysimple/Makefile_r_vsc
index c4e0d24..4bea998 100644
--- a/cmd/verysimple/Makefile_r_vsc
+++ b/cmd/verysimple/Makefile_r_vsc
@@ -1,21 +1,6 @@
 # 本文件用于编译release版的vsc, 用于github action中的matrix, 所以不需要在这里指定GOOS
 
-cmd:=go build -tags "vsc $(tags)"  -trimpath -ldflags "-X 'main.Version=${BUILD_VERSION}' -s -w -buildid="
-
-define compile
-	$(cmd)
-	tar -cJf ${PACKNAME}.tar.xz verysimple* -C ../../ examples/
-	rm verysimple*
-endef
-
-
-
-
 all:
-	$(call compile,${THARCH})
-
-clean:
-	rm -f ${prefix}
-	rm -f ${prefix}.exe
-	rm -f ${prefix}_*
-	rm -f *.tar.xz
+	go build -tags "vsc $(tags)"  -trimpath -ldflags "-X 'main.Version=${BUILD_VERSION}' -s -w -buildid="
+	tar -cJf ${PACKNAME}.tar.xz verysimple* -C ../../ examples/
+	rm verysimple*
\ No newline at end of file