summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/ios.yml1
-rw-r--r--ios/MullvadVPN.xcodeproj/project.pbxproj14
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme11
-rw-r--r--ios/TestPlans/MullvadVPNApp.xctestplan46
-rw-r--r--ios/TestPlans/MullvadVPNCI.xctestplan53
-rwxr-xr-xios/build.sh1
6 files changed, 125 insertions, 1 deletions
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index b58870edb4..aa82aa450b 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -6,6 +6,7 @@ on:
- .github/workflows/ios.yml
- ios/.swiftformat
- ios/**/*.swift
+ - ios/**/*.xctestplan
workflow_dispatch:
jobs:
check-formatting:
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
index 8c92325d84..e8a1fe1e0e 100644
--- a/ios/MullvadVPN.xcodeproj/project.pbxproj
+++ b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -396,6 +396,7 @@
7A7AD28D29DC677800480EF1 /* FirstTimeLaunch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A7AD28C29DC677800480EF1 /* FirstTimeLaunch.swift */; };
7A7AD28F29DEDB1C00480EF1 /* SettingsHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A7AD28E29DEDB1C00480EF1 /* SettingsHeaderView.swift */; };
7A818F1F29F0305800C7F0F4 /* RootConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A818F1E29F0305800C7F0F4 /* RootConfiguration.swift */; };
+ 7A83C3FF2A55B72E00DFB83A /* MullvadVPNApp.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 7A83C3FE2A55B72E00DFB83A /* MullvadVPNApp.xctestplan */; };
7ABE318D2A1CDD4500DF4963 /* UIFont+Weight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ABE318C2A1CDD4500DF4963 /* UIFont+Weight.swift */; };
7AE47E522A17972A000418DA /* CustomAlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE47E512A17972A000418DA /* CustomAlertViewController.swift */; };
7AF0419E29E957EB00D492DD /* AccountCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AF0419D29E957EB00D492DD /* AccountCoordinator.swift */; };
@@ -1176,6 +1177,8 @@
7A7AD28C29DC677800480EF1 /* FirstTimeLaunch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstTimeLaunch.swift; sourceTree = "<group>"; };
7A7AD28E29DEDB1C00480EF1 /* SettingsHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsHeaderView.swift; sourceTree = "<group>"; };
7A818F1E29F0305800C7F0F4 /* RootConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootConfiguration.swift; sourceTree = "<group>"; };
+ 7A83C3FE2A55B72E00DFB83A /* MullvadVPNApp.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MullvadVPNApp.xctestplan; sourceTree = "<group>"; };
+ 7A83C4002A55B81A00DFB83A /* MullvadVPNCI.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = MullvadVPNCI.xctestplan; sourceTree = "<group>"; };
7ABE318C2A1CDD4500DF4963 /* UIFont+Weight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Weight.swift"; sourceTree = "<group>"; };
7AE47E512A17972A000418DA /* CustomAlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAlertViewController.swift; sourceTree = "<group>"; };
7AF0419D29E957EB00D492DD /* AccountCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountCoordinator.swift; sourceTree = "<group>"; };
@@ -2086,6 +2089,7 @@
A97F1F422A1F4E1A00ECEFDE /* MullvadTransport */,
584023202A406BF5007B27AC /* TunnelObfuscation */,
58695A9E2A4ADA9200328DB3 /* TunnelObfuscationTests */,
+ 7A83C3FC2A55B39500DFB83A /* TestPlans */,
58CE5E61224146200008646E /* Products */,
584F991F2902CBDD001F858D /* Frameworks */,
);
@@ -2272,6 +2276,15 @@
path = MullvadRESTTests;
sourceTree = "<group>";
};
+ 7A83C3FC2A55B39500DFB83A /* TestPlans */ = {
+ isa = PBXGroup;
+ children = (
+ 7A83C3FE2A55B72E00DFB83A /* MullvadVPNApp.xctestplan */,
+ 7A83C4002A55B81A00DFB83A /* MullvadVPNCI.xctestplan */,
+ );
+ path = TestPlans;
+ sourceTree = "<group>";
+ };
A97F1F422A1F4E1A00ECEFDE /* MullvadTransport */ = {
isa = PBXGroup;
children = (
@@ -2917,6 +2930,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 7A83C3FF2A55B72E00DFB83A /* MullvadVPNApp.xctestplan in Resources */,
58727283265D173C00F315B2 /* LaunchScreen.storyboard in Resources */,
5859A55529CD9DD900F66591 /* changes.txt in Resources */,
587DCCEF287D84A500CE821E /* countries.geo.json in Resources */,
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme
index 44fd0a5d6a..ecfd93db2a 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPN.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -153,6 +153,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
<Testables>
<TestableReference
skipped = "NO">
diff --git a/ios/TestPlans/MullvadVPNApp.xctestplan b/ios/TestPlans/MullvadVPNApp.xctestplan
new file mode 100644
index 0000000000..6afa8d2b69
--- /dev/null
+++ b/ios/TestPlans/MullvadVPNApp.xctestplan
@@ -0,0 +1,46 @@
+{
+ "configurations" : [
+ {
+ "id" : "09D135C9-74DF-449C-AA90-9BDB4F4E3023",
+ "name" : "Configuration 1",
+ "options" : {
+
+ }
+ }
+ ],
+ "defaultOptions" : {
+ "targetForVariableExpansion" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58CE5E5F224146200008646E",
+ "name" : "MullvadVPN"
+ },
+ "testTimeoutsEnabled" : true
+ },
+ "testTargets" : [
+ {
+ "parallelizable" : true,
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58B0A29F238EE67E00BC001D",
+ "name" : "MullvadVPNTests"
+ }
+ },
+ {
+ "parallelizable" : true,
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58FBFBE5291622580020E046",
+ "name" : "MullvadRESTTests"
+ }
+ },
+ {
+ "parallelizable" : true,
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "589A455128E094B300565204",
+ "name" : "OperationsTests"
+ }
+ }
+ ],
+ "version" : 1
+}
diff --git a/ios/TestPlans/MullvadVPNCI.xctestplan b/ios/TestPlans/MullvadVPNCI.xctestplan
new file mode 100644
index 0000000000..50799cc8ff
--- /dev/null
+++ b/ios/TestPlans/MullvadVPNCI.xctestplan
@@ -0,0 +1,53 @@
+{
+ "configurations" : [
+ {
+ "id" : "E4117B5A-56A7-46CD-8037-2897AA9E2324",
+ "name" : "Configuration 1",
+ "options" : {
+
+ }
+ }
+ ],
+ "defaultOptions" : {
+ "targetForVariableExpansion" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58CE5E5F224146200008646E",
+ "name" : "MullvadVPN"
+ },
+ "testTimeoutsEnabled" : true
+ },
+ "testTargets" : [
+ {
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58D0C79223F1CE7000FE9BA7",
+ "name" : "MullvadVPNScreenshots"
+ }
+ },
+ {
+ "parallelizable" : true,
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58FBFBE5291622580020E046",
+ "name" : "MullvadRESTTests"
+ }
+ },
+ {
+ "parallelizable" : true,
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58B0A29F238EE67E00BC001D",
+ "name" : "MullvadVPNTests"
+ }
+ },
+ {
+ "parallelizable" : true,
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "589A455128E094B300565204",
+ "name" : "OperationsTests"
+ }
+ }
+ ],
+ "version" : 1
+}
diff --git a/ios/build.sh b/ios/build.sh
index 14f8fa59d7..406cd5738b 100755
--- a/ios/build.sh
+++ b/ios/build.sh
@@ -106,6 +106,7 @@ release_build() {
-sdk iphoneos \
-configuration Release \
-derivedDataPath "$DERIVED_DATA_DIR" \
+ -testPlan MullvadVPNCI \
$@
}
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.