use go file and split ios/macos calls

Jigsaw-Code · Dec 11, 2023 · 121147b · 121147b
1 parent 0c61a37
commit 121147b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/build_and_test_debug.yml b/.github/workflows/build_and_test_debug.yml
@@ -66,7 +66,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Build Linux Client
         run: npm run action electron/build linux
@@ -95,7 +95,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Build Windows Client
         run: npm run action electron/build windows
@@ -124,7 +124,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Build Tun2Socks (required for Test OutlineAppleLib)
         run: npm run action tun2socks/build macos
@@ -165,7 +165,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Build Tun2Socks (required for Test OutlineAppleLib)
         run: npm run action tun2socks/build ios  
@@ -206,7 +206,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Build Tun2Socks (required for Test OutlineAppleLib)
         run: npm run action tun2socks/build maccatalyst
@@ -244,7 +244,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version-file: '${{ github.workspace }}/go.mod'
 
       - name: Install Java
         uses: actions/[email protected]

diff --git a/src/tun2socks/build.action.mjs b/src/tun2socks/build.action.mjs
@@ -67,6 +67,17 @@ export async function main(...parameters) {
         'github.com/Jigsaw-Code/outline-client/src/tun2socks/outline/shadowsocks'
       );
     case 'ios' + 'darwin':
+      return spawnStream(
+        'gomobile',
+        'bind',
+        '-bundleid=org.outline.tun2socks',
+        '-iosversion=12.0',
+        `-target=ios,iossimulator`,
+        `-o=${buildDir}/tun2socks.xcframework`,
+
+        'github.com/Jigsaw-Code/outline-client/src/tun2socks/outline/tun2socks',
+        'github.com/Jigsaw-Code/outline-client/src/tun2socks/outline/shadowsocks'
+      );
     case 'macos' + 'darwin':
     case 'maccatalyst' + 'darwin':
       process.env.MACOSX_DEPLOYMENT_TARGET = '10.14';
@@ -76,7 +87,7 @@ export async function main(...parameters) {
         'bind',
         '-bundleid=org.outline.tun2socks',
         '-iosversion=13.1',
-        `-target=ios,iossimulator,macos,maccatalyst`,
+        `-target=macos,maccatalyst`,
         `-o=${buildDir}/tun2socks.xcframework`,
 
         'github.com/Jigsaw-Code/outline-client/src/tun2socks/outline/tun2socks',