-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "chore: add outline-go-tun2socks, except android (#1744)"
This reverts commit e8dcd79.
- Loading branch information
1 parent
e8dcd79
commit b2eef5d
Showing
41 changed files
with
50 additions
and
1,998 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,6 @@ on: | |
| branches: | ||
| - master | ||
|
|
||
| # TODO: run go tests | ||
| jobs: | ||
| web_test: | ||
| name: Web Test | ||
|
|
@@ -64,11 +63,6 @@ jobs: | |
| - name: Install NPM Dependencies | ||
| run: npm ci | ||
|
|
||
| - name: Install Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: '${{ github.workspace }}/go.mod' | ||
|
|
||
| - name: Build Linux Client | ||
| run: npm run action electron/build linux | ||
|
|
||
|
|
@@ -93,11 +87,6 @@ jobs: | |
| - name: Install NPM Dependencies | ||
| run: npm ci | ||
|
|
||
| - name: Install Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: '${{ github.workspace }}/go.mod' | ||
|
|
||
| - name: Build Windows Client | ||
| run: npm run action electron/build windows | ||
|
|
||
|
|
@@ -122,14 +111,6 @@ jobs: | |
| - name: Install NPM Dependencies | ||
| run: npm ci | ||
|
|
||
| - name: Install Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: '${{ github.workspace }}/go.mod' | ||
|
|
||
| - name: Build Tun2Socks (required for Test OutlineAppleLib) | ||
| run: npm run action tun2socks/build macos | ||
|
|
||
| - name: Test OutlineAppleLib | ||
| run: npm run action cordova/test macos | ||
|
|
||
|
|
@@ -163,14 +144,6 @@ jobs: | |
| - name: Install NPM Dependencies | ||
| run: npm ci | ||
|
|
||
| - name: Install Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: '${{ github.workspace }}/go.mod' | ||
|
|
||
| - name: Build Tun2Socks (required for Test OutlineAppleLib) | ||
| run: npm run action tun2socks/build ios | ||
|
|
||
| - name: Test OutlineAppleLib | ||
| run: npm run action cordova/test ios | ||
|
|
||
|
|
@@ -204,14 +177,6 @@ jobs: | |
| - name: Install NPM Dependencies | ||
| run: npm ci | ||
|
|
||
| - name: Install Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: '${{ github.workspace }}/go.mod' | ||
|
|
||
| - name: Build Tun2Socks (required for Test OutlineAppleLib) | ||
| run: npm run action tun2socks/build maccatalyst | ||
|
|
||
| - name: Test OutlineAppleLib | ||
| run: npm run action cordova/test maccatalyst | ||
|
|
||
|
|
@@ -242,11 +207,6 @@ jobs: | |
| - name: Install NPM Dependencies | ||
| run: npm ci | ||
|
|
||
| - name: Install Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: '${{ github.workspace }}/go.mod' | ||
|
|
||
| - name: Install Java | ||
| uses: actions/[email protected] | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| .idea | ||
| .vs/ | ||
| .vscode | ||
| *.DS_Store | ||
| *.env | ||
| *.pdb | ||
| *.sw? | ||
| /node_modules | ||
| /build | ||
| /output | ||
| /build | ||
| info.txt | ||
| /node_modules | ||
| /platforms | ||
| /plugins | ||
| /third_party/Potatso/Pods | ||
| /www | ||
| coverage | ||
| info.txt | ||
| keystore.p12 | ||
| /third_party/Potatso/Pods | ||
| xcuserdata/ | ||
| .vs/ | ||
| obj/ | ||
| Outline.apk | ||
| Outline.apks | ||
| packages/ | ||
| toc.pb | ||
| *.pdb | ||
| tools/OutlineService/OutlineService/bin/* | ||
| tools/smartdnsblock/bin/* | ||
| !tools/OutlineService/OutlineService/bin/*.exe | ||
| *.sw? | ||
| tools/smartdnsblock/bin/* | ||
| !tools/smartdnsblock/bin/*.exe | ||
| keystore.p12 | ||
| Outline.apk | ||
| Outline.apks | ||
| universal.apk | ||
| xcuserdata/ | ||
| toc.pb | ||
| coverage | ||
| *.env |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,23 @@ | ||
| module github.com/Jigsaw-Code/outline-client | ||
| module github.com/Jigsaw-Code/outline-apps | ||
|
|
||
| go 1.20 | ||
|
|
||
| require ( | ||
| github.com/Jigsaw-Code/outline-sdk v0.0.9 | ||
| github.com/Jigsaw-Code/outline-sdk v0.0.2 | ||
| github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20230807220427-893de7fdc6b8 | ||
| github.com/crazy-max/xgo v0.30.0 | ||
| github.com/eycorsican/go-tun2socks v1.16.11 | ||
| github.com/stretchr/testify v1.8.4 | ||
| golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a | ||
| golang.org/x/sys v0.15.0 | ||
| golang.org/x/sys v0.11.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/eycorsican/go-tun2socks v1.16.11 // indirect | ||
| github.com/miekg/dns v1.1.54 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| github.com/shadowsocks/go-shadowsocks2 v0.1.5 // indirect | ||
| github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 // indirect | ||
| golang.org/x/crypto v0.16.0 // indirect | ||
| golang.org/x/mod v0.14.0 // indirect | ||
| golang.org/x/net v0.19.0 // indirect | ||
| golang.org/x/sync v0.5.0 // indirect | ||
| golang.org/x/tools v0.16.0 // indirect | ||
| golang.org/x/crypto v0.9.0 // indirect | ||
| golang.org/x/mod v0.10.0 // indirect | ||
| golang.org/x/net v0.10.0 // indirect | ||
| golang.org/x/tools v0.9.1 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.