fixing tests and workflow

brightdigit · Oct 22, 2024 · bc42502 · bc42502
1 parent e2a50d5
commit bc42502
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 37 deletions.
diff --git a/.github/workflows/FelinePineLogging.yml b/.github/workflows/FelinePineLogging.yml
@@ -14,8 +14,13 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
       matrix:
-        runs-on: [ubuntu-20.04, ubuntu-22.04]
-        swift-version: [5.8.1, 5.9, "5.10", "6.0.1"]
+        runs-on: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
+        swift-version: [5.8.1, 5.9, "5.10.1", "6.0.1"]
+        exclude:
+          - runs-on: ubuntu-24.04
+            swift-version: 5.9            
+          - runs-on: ubuntu-24.04
+            swift-version: 5.8.1
     steps:
       - uses: actions/checkout@v4
       - name: Cache swift package modules
@@ -76,12 +81,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - runs-on: macos-13
-            xcode: "/Applications/Xcode_14.3.1.app"
-            iOSVersion: "16.4"
-            watchOSVersion: "9.4"
-            watchName: "Apple Watch Series 5 (40mm)"
-            iPhoneName: "iPhone 14"
           - runs-on: macos-13
             xcode: "/Applications/Xcode_15.0.1.app"
             iOSVersion: "17.0.1"
@@ -101,11 +100,11 @@ jobs:
             watchName: "Apple Watch Series 9 (45mm)"
             iPhoneName: "iPhone 15 Pro"
           - runs-on: macos-15
-            xcode: "/Applications/Xcode_16.1.app"            
-            iOSVersion: "18.0"
-            watchOSVersion: "11.0"
-            watchName: "Apple Watch Series 10 (42mm)"
-            iPhoneName: "iPhone 16"
+            xcode: "/Applications/Xcode_16.1.app"
+            iOSVersion: "18.1"
+            watchOSVersion: "11.1"
+            watchName: "Apple Watch Series 10 (46mm)"
+            iPhoneName: "iPhone 16 Pro"
     steps:
       - uses: actions/checkout@v4
       - name: Cache swift package modules
@@ -145,7 +144,7 @@ jobs:
       - name: Build
         run: swift build
       - name: Run Swift Package tests
-        run: swift test -v --enable-code-coverage      
+        run: swift test -v --enable-code-coverage
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-spm
         with:          
@@ -161,16 +160,6 @@ jobs:
       - name: Lint
         run: ./scripts/lint.sh
         if: ${{ github.event_name == 'pull_request' && ( github.base_ref == 'main' || endsWith( github.ref_name , 'Prep') ) && matrix.xcode == '/Applications/Xcode_16.1.app' }}
-      - name: Dump PIF
-        if: startsWith(matrix.xcode,'/Applications/Xcode_14')
-        run: |
-          swift package dump-pif > /dev/null
-          MAX_ATTEMPT=3
-          ATTEMPT=0
-          while [ -z $SUCCESS ] && [ "$ATTEMPT" -le "$MAX_ATTEMPT" ]; do
-            xcodebuild clean -scheme FelinePine -destination 'generic/platform=iOS' | grep -q "CLEAN SUCCEEDED" && SUCCESS=true
-            ATTEMPT=$(($ATTEMPT+1))
-          done
       - name: Run iOS target tests
         run: xcodebuild test -scheme FelinePine -sdk iphonesimulator -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4

diff --git a/Packages/FelinePine/.swiftformat b/Packages/FelinePine/.swiftformat
@@ -4,4 +4,4 @@
 --disable wrapMultilineStatementBraces, redundantInternal
 --extensionacl on-declarations
 --decimalgrouping 3,4
---exclude .build, DerivedData, Sample
+--exclude .build, DerivedData, Sample, Packages
diff --git a/Packages/FelinePine/.swiftlint.yml b/Packages/FelinePine/.swiftlint.yml
@@ -110,5 +110,6 @@ identifier_name:
 excluded:
   - DerivedData
   - .build
+  - Packages
 indentation_width:
   indentation_width: 2
diff --git a/Sources/FelinePineLogging/LoggingSystem+LoggingSystemRepository.swift b/Sources/FelinePineLogging/LoggingSystem+LoggingSystemRepository.swift
@@ -64,17 +64,17 @@ private class LoggingSystemRepository: @unchecked Sendable {
 
 // swiftlint:enable strict_fileprivate
 
-extension LoggingSystem {
-  // swiftlint:disable:next missing_docs
-  public static var identifier: String {
-    String(reflecting: Self.self)
-  }
-
-  /// By default, this is `Bundle.main.bundleIdentifier`.
-  public static var subsystem: String {
-    identifier
-  }
-}
+//extension LoggingSystem {
+//  // swiftlint:disable:next missing_docs
+//  public static var identifier: String {
+//    String(reflecting: Self.self)
+//  }
+//
+//  /// By default, this is `Bundle.main.bundleIdentifier`.
+//  public static var subsystem: String {
+//    identifier
+//  }
+//}
 
 extension LoggingSystem where Category: CaseIterable {
   private static var loggers: [Category: Logging.Logger] {

diff --git a/Tests/FelinePineLoggingTests/Mocks/MockSystem.swift b/Tests/FelinePineLoggingTests/Mocks/MockSystem.swift
@@ -27,8 +27,9 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-@testable import FelinePineLogging
+@testable public import FelinePineLogging
 import XCTest
+import FelinePine
 
 internal struct MockSystem: LoggingSystem {
   internal enum Category: String, CaseIterable {

diff --git a/Tests/FelinePineLoggingTests/Mocks/MockType.swift b/Tests/FelinePineLoggingTests/Mocks/MockType.swift
@@ -29,6 +29,7 @@
 
 @testable import FelinePineLogging
 import XCTest
+import FelinePine
 
 internal struct MockType: FelinePineProtocol {
   internal typealias LoggingSystemType = MockSystem