Better

Jigsaw-Code · Apr 11, 2024 · 3688bb0 · 3688bb0
1 parent ede26cd
commit 3688bb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/client/src/tun2socks/Taskfile.yml b/client/src/tun2socks/Taskfile.yml
@@ -24,21 +24,17 @@ tasks:
       TARGET_DIR: "{{.OUT_DIR}}/windows"
     cmds:
       - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}"
-      - cmd: go build {{.ELECTRON_BUILD_FLAGS}} -o '{{.TARGET_DIR}}/tun2socks.exe' '{{.ELECTRON_MAIN_PKG}}'
-        platforms: [windows]
-      - cmd: GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC='zig cc -target x86_64-windows' go build {{.ELECTRON_BUILD_FLAGS}} -o '{{.TARGET_DIR}}/tun2socks.exe' '{{.ELECTRON_MAIN_PKG}}'
-        platforms: [darwin, linux]
+      - |
+        {{if ne OS "windows"}}GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC='zig cc -target x86_64-windows' {{end}}go build {{.ELECTRON_BUILD_FLAGS}} -o '{{.TARGET_DIR}}/tun2socks.exe' '{{.ELECTRON_MAIN_PKG}}'
 
   linux:
     desc: "Build the tun2socks binary for Linux"
     vars:
       TARGET_DIR: '{{.OUT_DIR}}/linux'
     cmds:
       - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}"
-      - cmd: go build {{.ELECTRON_BUILD_FLAGS}} -o '{{.TARGET_DIR}}/tun2socks' '{{.ELECTRON_MAIN_PKG}}'
-        platforms: [linux]
-      - cmd: GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC='zig cc -target x86_64-linux' go build {{.ELECTRON_BUILD_FLAGS}} -o '{{.TARGET_DIR}}/tun2socks' '{{.ELECTRON_MAIN_PKG}}'
-        platforms: [darwin, windows]
+      - |
+        {{if ne OS "linux"}}GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC='zig cc -target x86_64-linux' {{end}}go build {{.ELECTRON_BUILD_FLAGS}} -o '{{.TARGET_DIR}}/tun2socks' '{{.ELECTRON_MAIN_PKG}}'
 
   android:
     desc: "Build the tun2socks.aar library for Android"

diff --git a/go.mod b/go.mod
@@ -2,8 +2,6 @@ module github.com/Jigsaw-Code/outline-apps
 
 go 1.21
 
-toolchain go1.22.1
-
 require (
 	github.com/Jigsaw-Code/outline-sdk v0.0.14-0.20240216220040-f741c57bf854
 	github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20240223000159-142376ee10ea