Compare commits

..

No commits in common. "fb664308aebb139e7f9a1decc81fa01c87f2fdc4" and "43fad65cf79b9a3901d54c5ce074eace2c27d3a9" have entirely different histories.

4 changed files with 3 additions and 77 deletions

View File

@ -1,74 +0,0 @@
# This workflow builds the iOS and Android apps, just to check they build without error
name: Smoke build
on:
push:
branches:
- main
pull_request:
jobs:
build-android:
name: Android
runs-on: macos-latest
steps:
- name: Set up Go 1.22
uses: actions/setup-go@v4
with:
go-version: "1.22"
- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17'
- name: Install flutter
uses: subosito/flutter-action@v2
with:
flutter-version: '3.24.1'
- name: Check out code
uses: actions/checkout@v3
- name: install dependencies
env:
TOKEN: ${{ secrets.MACHINE_USER_PAT }}
run: |
go install golang.org/x/mobile/cmd/gomobile@latest
gomobile init
flutter pub get
touch env.sh
- name: Build Android debug
run: flutter build appbundle --debug
build-ios:
name: iOS
runs-on: macos-latest
steps:
- name: Set up Go 1.22
uses: actions/setup-go@v4
with:
go-version: "1.22"
- name: Install flutter
uses: subosito/flutter-action@v2
with:
flutter-version: '3.24.1'
- name: Check out code
uses: actions/checkout@v3
- name: install dependencies
run: |
go install golang.org/x/mobile/cmd/gomobile@latest
gomobile init
flutter pub get
touch env.sh
- name: Build iOS
run: |
cd ios
pod install
xcodebuild -workspace Runner.xcworkspace -scheme Runner -configuration Release clean archive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO -archivePath "build/MobileNebula.xcarchive"

View File

@ -488,7 +488,7 @@ struct IncomingSite: Codable {
private func finishSaveToManager(manager: NETunnelProviderManager, callback: @escaping (Error?) -> ()) { private func finishSaveToManager(manager: NETunnelProviderManager, callback: @escaping (Error?) -> ()) {
// Stuff our details in the protocol // Stuff our details in the protocol
let proto = manager.protocolConfiguration as? NETunnelProviderProtocol ?? NETunnelProviderProtocol() let proto = manager.protocolConfiguration as? NETunnelProviderProtocol ?? NETunnelProviderProtocol()
proto.providerBundleIdentifier = "net.defined.mobileNebula.NebulaNetworkExtension";
proto.providerConfiguration = ["id": self.id] proto.providerConfiguration = ["id": self.id]
proto.serverAddress = "Nebula" proto.serverAddress = "Nebula"

View File

@ -9,7 +9,7 @@ clean:
mobileNebula.aar: *.go go.sum mobileNebula.aar: *.go go.sum
go get -d golang.org/x/mobile/cmd/gomobile go get -d golang.org/x/mobile/cmd/gomobile
gomobile bind -trimpath -v --target=android -androidapi=26 gomobile bind -trimpath -v --target=android -androidapi 26
MobileNebula.xcframework: *.go go.sum MobileNebula.xcframework: *.go go.sum
go get -d golang.org/x/mobile/cmd/gomobile go get -d golang.org/x/mobile/cmd/gomobile