Skip to content

Commit 93a9240

Browse files
soumyamahuntsoumyamahunt
committed
ci: parallelize macos runner tests on the same runner (#1)
* ci: parallelize macos runner tests on the same runner * wip: update reusable workflow attributes * wip: update oldest macos runners * wip: switch back to default ci branch * wip: switch back to default ci branch * wip: use `ubuntu-20.04` for older swift tests
1 parent 7ddc333 commit 93a9240

File tree

6 files changed

+49
-76
lines changed

6 files changed

+49
-76
lines changed

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
"swift": "5.7"
6060
},
6161
{
62-
"os": "ubuntu-latest",
62+
"os": "ubuntu-20.04",
6363
"swift": "5.2"
6464
}
6565
]
@@ -82,66 +82,14 @@ jobs:
8282
name: CocoaPods
8383
uses: SwiftyLab/ci/.github/workflows/cocoapods.yml@main
8484
with:
85-
matrix: >
86-
{
87-
"include": [
88-
{
89-
"os": "macos-12",
90-
"xcode": "13.4",
91-
"platform": "macos"
92-
},
93-
{
94-
"os": "macos-12",
95-
"xcode": "13.4",
96-
"platform": "watchos"
97-
},
98-
{
99-
"os": "macos-12",
100-
"xcode": "13.4",
101-
"platform": "tvos"
102-
},
103-
{
104-
"os": "macos-12",
105-
"xcode": "13.4",
106-
"platform": "ios"
107-
}
108-
]
109-
}
85+
os: macos-12
11086

11187
xcode-test:
11288
name: Xcode
11389
uses: SwiftyLab/ci/.github/workflows/xcode.yml@main
11490
with:
115-
matrix: >
116-
{
117-
"include": [
118-
{
119-
"os": "macos-10.15",
120-
"xcode": "11.3.1",
121-
"platform": "macOS"
122-
},
123-
{
124-
"os": "macos-10.15",
125-
"xcode": "11.3.1",
126-
"platform": "watchOS"
127-
},
128-
{
129-
"os": "macos-10.15",
130-
"xcode": "11.3.1",
131-
"platform": "tvOS"
132-
},
133-
{
134-
"os": "macos-10.15",
135-
"xcode": "11.3.1",
136-
"platform": "iOS"
137-
},
138-
{
139-
"os": "macos-10.15",
140-
"xcode": "11.3.1",
141-
"platform": "mac-catalyst"
142-
}
143-
]
144-
}
91+
os: macos-11
92+
xcode: '11.7'
14593

14694
ci:
14795
name: CI

‎CHANGELOG.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
## 1.0.0 (2022-12-18)
2+
3+
4+
### ✅ Tests
5+
6+
* add data validation tests ([ff66119](https://github.com/SwiftyLab/ValidatableKit/commit/ff6611966d6b897f1ad384ee01150d5df035687e))
7+
8+
9+
### 📚 Documentation
10+
11+
* add project documentation, contributing and conduct guidelines ([a1602b7](https://github.com/SwiftyLab/ValidatableKit/commit/a1602b77b0d9525d789e73889baf851dcc8ef466))
12+
13+
14+
### 💄 Styles
15+
16+
* add swift-format for code formatting ([2ceacad](https://github.com/SwiftyLab/ValidatableKit/commit/2ceacad76a84bd1181ae0f7a631d079cae84b5a0))
17+
* add vscode workspace settings ([541cf4d](https://github.com/SwiftyLab/ValidatableKit/commit/541cf4ded3752ea9ed5e8f2a85dcef9f566be915))
18+
19+
20+
### 🚀 Features
21+
22+
* add Carthage support ([2b6c8c7](https://github.com/SwiftyLab/ValidatableKit/commit/2b6c8c7c325ce0ffe0aa62d3015f03413c057e29))
23+
* add CocoaPods support ([d1dd0ca](https://github.com/SwiftyLab/ValidatableKit/commit/d1dd0ca8cd5e668569e0d818d656646e87059c19))
24+
* add data validation DSL ([b8f872e](https://github.com/SwiftyLab/ValidatableKit/commit/b8f872e2750c36d769ded788a0f60fd70ff4eabc))
25+

‎[email protected]‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ let appleGitHub = "\(github)/apple"
88
let package = Package(
99
name: "ValidatableKit",
1010
platforms: [
11-
.iOS(.v8),
12-
.macOS(.v10_10),
13-
.tvOS(.v9),
14-
.watchOS(.v2),
11+
.iOS(.v11),
12+
.macOS(.v10_13),
13+
.tvOS(.v11),
14+
.watchOS(.v4),
1515
.macCatalyst(.v13),
1616
],
1717
products: [

‎Sources/ValidatableKit/Validators/CharacterSet.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import struct Foundation.CharacterSet
1+
import Foundation
22

33
public extension Validator where T: StringProtocol {
44
/// Validates that all characters in a `String` are ASCII (bytes 0..<128).

‎Sources/ValidatableKit/Validators/URL.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import struct Foundation.URL
1+
import Foundation
22

33
public extension Validator where T == String {
44
/// Validates whether a `String` is a valid URL.

‎ValidatableKit.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24-
750D98C6416100F2545A5AC7 /* ValidatableKit.docc in Sources */ = {isa = PBXBuildFile; fileRef = DA6AE5584EC98BABBD5DA510 /* ValidatableKit.docc */; };
24+
47D2C6A8521E8B4479FD3949 /* ValidatableKit.docc in Sources */ = {isa = PBXBuildFile; fileRef = 408E7642B9561DDA378AFFBF /* ValidatableKit.docc */; };
2525
OBJ_100 /* ValidatableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_44 /* ValidatableTests.swift */; };
2626
OBJ_101 /* ValidatorsOperatorsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_45 /* ValidatorsOperatorsTests.swift */; };
2727
OBJ_102 /* ValidatorsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_46 /* ValidatorsTests.swift */; };
@@ -57,7 +57,7 @@
5757
/* End PBXBuildFile section */
5858

5959
/* Begin PBXFileReference section */
60-
DA6AE5584EC98BABBD5DA510 /* ValidatableKit.docc */ = {isa = PBXFileReference; includeInIndex = 1; path = ValidatableKit.docc; sourceTree = "<group>"; };
60+
408E7642B9561DDA378AFFBF /* ValidatableKit.docc */ = {isa = PBXFileReference; includeInIndex = 1; path = ValidatableKit.docc; sourceTree = "<group>"; };
6161
OBJ_12 /* Invalid.swift */ = {isa = PBXFileReference; path = Invalid.swift; sourceTree = "<group>"; };
6262
OBJ_13 /* Nested.swift */ = {isa = PBXFileReference; path = Nested.swift; sourceTree = "<group>"; };
6363
OBJ_14 /* Skipped.swift */ = {isa = PBXFileReference; path = Skipped.swift; sourceTree = "<group>"; };
@@ -118,7 +118,7 @@
118118
OBJ_18 /* Validations.swift */,
119119
OBJ_19 /* Validator.swift */,
120120
OBJ_20 /* Validators */,
121-
DA6AE5584EC98BABBD5DA510 /* ValidatableKit.docc */,
121+
408E7642B9561DDA378AFFBF /* ValidatableKit.docc */,
122122
);
123123
name = ValidatableKit;
124124
path = Sources/ValidatableKit;
@@ -354,7 +354,7 @@
354354
OBJ_75 /* Or.swift in Sources */,
355355
OBJ_76 /* Regex.swift in Sources */,
356356
OBJ_77 /* URL.swift in Sources */,
357-
750D98C6416100F2545A5AC7 /* ValidatableKit.docc in Sources */,
357+
47D2C6A8521E8B4479FD3949 /* ValidatableKit.docc in Sources */,
358358
);
359359
};
360360
OBJ_83 /* Sources */ = {
@@ -509,7 +509,7 @@
509509
isa = XCBuildConfiguration;
510510
buildSettings = {
511511
LD = /usr/bin/true;
512-
OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/ManifestAPI -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.0.sdk -package-description-version 5.6.0";
512+
OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/ManifestAPI -package-description-version 5.7.0";
513513
SWIFT_VERSION = 5.0;
514514
};
515515
name = Debug;
@@ -518,7 +518,7 @@
518518
isa = XCBuildConfiguration;
519519
buildSettings = {
520520
LD = /usr/bin/true;
521-
OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/ManifestAPI -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.0.sdk -package-description-version 5.6.0";
521+
OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/ManifestAPI -package-description-version 5.7.0";
522522
SWIFT_VERSION = 5.0;
523523
};
524524
name = Release;
@@ -549,17 +549,17 @@
549549
);
550550
HEADER_SEARCH_PATHS = "$(inherited)";
551551
INFOPLIST_FILE = ValidatableKit.xcodeproj/ValidatableKitTests_Info.plist;
552-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
552+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
553553
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks";
554-
MACOSX_DEPLOYMENT_TARGET = 11.0;
554+
MACOSX_DEPLOYMENT_TARGET = 10.13;
555555
OTHER_CFLAGS = "$(inherited)";
556556
OTHER_LDFLAGS = "$(inherited)";
557557
OTHER_SWIFT_FLAGS = "$(inherited)";
558558
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
559559
SWIFT_VERSION = 5.0;
560560
TARGET_NAME = ValidatableKitTests;
561-
TVOS_DEPLOYMENT_TARGET = 14.0;
562-
WATCHOS_DEPLOYMENT_TARGET = 7.0;
561+
TVOS_DEPLOYMENT_TARGET = 11.0;
562+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
563563
};
564564
name = Debug;
565565
};
@@ -577,17 +577,17 @@
577577
);
578578
HEADER_SEARCH_PATHS = "$(inherited)";
579579
INFOPLIST_FILE = ValidatableKit.xcodeproj/ValidatableKitTests_Info.plist;
580-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
580+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
581581
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks";
582-
MACOSX_DEPLOYMENT_TARGET = 11.0;
582+
MACOSX_DEPLOYMENT_TARGET = 10.13;
583583
OTHER_CFLAGS = "$(inherited)";
584584
OTHER_LDFLAGS = "$(inherited)";
585585
OTHER_SWIFT_FLAGS = "$(inherited)";
586586
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
587587
SWIFT_VERSION = 5.0;
588588
TARGET_NAME = ValidatableKitTests;
589-
TVOS_DEPLOYMENT_TARGET = 14.0;
590-
WATCHOS_DEPLOYMENT_TARGET = 7.0;
589+
TVOS_DEPLOYMENT_TARGET = 11.0;
590+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
591591
};
592592
name = Release;
593593
};

0 commit comments

Comments
 (0)