Update CI (#63)

Author: tgrapperon

.github/workflows/ci.yml

@@ -14,22 +14,45 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  library:
-    runs-on: macos-12
+  library-swift-latest:
+    name: Library (swift-latest)
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: ['14.2']
         config: ['debug', 'release']
     steps:
       - uses: actions/checkout@v3
-      - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
-      - name: Run tests
-        run: make test-swift
+      - name: Select Xcode 14.3
+        run: sudo xcode-select -s /Applications/Xcode_14.3.app
+      - name: Run ${{ matrix.config }} tests
+        run: CONFIG=${{ matrix.config }} make test-library
       - name: Build platforms ${{ matrix.config }}
         run: CONFIG=${{ matrix.config }} make build-all-platforms
+        
+  library-evolution:
+    name: Library (evolution)
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v3
+      - name: Select Xcode 14.3
+        run: sudo xcode-select -s /Applications/Xcode_14.3.app
       - name: Build for library evolution
         run: make build-for-library-evolution
+          
+  library-swift-5-7:
+    name: Library (swift 5.7)
+    runs-on: macos-12
+    strategy:
+      matrix:
+        config: ['debug', 'release']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Select Xcode 14.2
+        run: sudo xcode-select -s /Applications/Xcode_14.2.app
+      - name: Run ${{ matrix.config }} tests
+        run: CONFIG=${{ matrix.config }} make test-library
+      - name: Build platforms ${{ matrix.config }}
+        run: CONFIG=${{ matrix.config }} make build-all-platforms
 
   ubuntu-tests:
     strategy:
@@ -40,3 +63,17 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run tests
         run: make test-swift
+
+  static-stdlib:
+    strategy:
+      matrix:
+        image: ['swift:5.7-focal', 'swift:5.8-focal']
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ matrix.image }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build for static-stdlib (debug)
+        run: swift build -c debug --static-swift-stdlib
+      - name: Build for static-stdlib (release)
+        run: swift build -c release --static-swift-stdlib

.github/workflows/format.yml

@@ -12,15 +12,13 @@ concurrency:
 jobs:
   swift_format:
     name: swift-format
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
-      - uses: actions/checkout@v3
-      - name: Xcode Select
-        run: sudo xcode-select -s /Applications/Xcode_14.0.1.app
-      - name: Tap
-        run: brew tap pointfreeco/formulae
-      - name: Install
-        run: brew install Formulae/swift-format@5.7
+      - uses: actions/checkout@v2
+      - name: Select Xcode 14.3
+        run: sudo xcode-select -s /Applications/Xcode_14.3.app
+      - name: Install swift-format
+        run: brew install swift-format
       - name: Format
         run: make format
       - uses: stefanzweifel/git-auto-commit-action@v4

DependenciesAdditions.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,3 +1,4 @@
+CONFIG = debug
 PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
 PLATFORM_MACOS = macOS
 PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
@@ -6,7 +7,21 @@ PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 7 (45mm)
 
 CONFIG = debug
 
-default: test
+default: test-all
+
+test-all:
+	CONFIG=debug test-library
+	CONFIG=release test-library
+
+test-library:
+	for platform in "$(PLATFORM_IOS)" "$(PLATFORM_MACOS)" "$(PLATFORM_MAC_CATALYST)" "$(PLATFORM_TVOS)" "$(PLATFORM_WATCHOS)"; do \
+		xcodebuild test \
+			-configuration $(CONFIG) \
+			-workspace DependenciesAdditions.xcworkspace \
+			-scheme DependenciesAdditions \
+			-destination platform="$$platform" || exit 1; \
+	done;
+
 
 build-all-platforms:
 	for platform in \
@@ -35,18 +50,34 @@ test-linux:
 		swift:5.7-focal \
 		bash -c 'apt-get update && apt-get -y install make && make test-swift'
 
+build-for-static-stdlib:
+	@swift build -c debug --static-swift-stdlib
+	@swift build -c release --static-swift-stdlib
+
 build-for-library-evolution:
 	swift build \
 		-c release \
-		--target Dependencies \
-		-Xswiftc -emit-module-interface \
+		--target DependenciesAdditions \
 		-Xswiftc -enable-library-evolution
 
+build-for-static-stdlib-docker:
+	@docker run \
+		-v "$(PWD):$(PWD)" \
+		-w "$(PWD)" \
+		swift:5.8-focal \
+		bash -c "swift build -c debug --static-swift-stdlib"
+	@docker run \
+		-v "$(PWD):$(PWD)" \
+		-w "$(PWD)" \
+		swift:5.8-focal \
+		bash -c "swift build -c release --static-swift-stdlib"
+
 format:
 	swift format \
 		--ignore-unparsable-files \
 		--in-place \
 		--recursive \
 		./Package.swift ./Sources ./Tests
 
-.PHONY: test test-swift test-linux build-for-library-evolution format
+
+.PHONY: test test-swift test-linux build-for-library-evolution format

Makefile

@@ -44,7 +44,7 @@ let package = Package(
     .library(name: "_SwiftUIDependency", targets: ["_SwiftUIDependency"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "0.1.0"),
+    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "0.4.0"),
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
   ],
   targets: [

Package.swift

@@ -190,33 +190,35 @@
       }
     #endif
 
-    @MainActor
-    func testConvertToScreenCoordinatesUsingCGRect() {
-      XCTExpectFailure {
-        let _ = accessibility.convertToScreenCoordinates(CGRect.zero, in: .init())
+    #if DEBUG
+      @MainActor
+      func testConvertToScreenCoordinatesUsingCGRect() {
+        XCTExpectFailure {
+          let _ = accessibility.convertToScreenCoordinates(CGRect.zero, in: .init())
+        }
       }
-    }
 
-    @MainActor
-    func testConvertToScreenCoordinatesUsingUIBezierPath() {
-      XCTExpectFailure {
-        let _ = accessibility.convertToScreenCoordinates(UIBezierPath.init(), in: .init())
+      @MainActor
+      func testConvertToScreenCoordinatesUsingUIBezierPath() {
+        XCTExpectFailure {
+          let _ = accessibility.convertToScreenCoordinates(UIBezierPath.init(), in: .init())
+        }
       }
-    }
 
-    func testFocusedElement() {
-      XCTExpectFailure {
-        let _ = accessibility.focusedElement(using: nil)
+      func testFocusedElement() {
+        XCTExpectFailure {
+          let _ = accessibility.focusedElement(using: nil)
+        }
       }
-    }
 
-    func testPost() {
-      XCTExpectFailure {
-        let _ = accessibility.post(
-          notification: UIAccessibility.Notification(rawValue: 0),
-          argument: nil
-        )
+      func testPost() {
+        XCTExpectFailure {
+          let _ = accessibility.post(
+            notification: UIAccessibility.Notification(rawValue: 0),
+            argument: nil
+          )
+        }
       }
-    }
+    #endif
   }
 #endif