Adding Actions for Child Packages (#39)

brightdigit · Aug 12, 2024 · 6b697a3 · 6b697a3
1 parent f18a0e7
commit 6b697a3
Show file tree

Hide file tree

Showing 117 changed files with 1,898 additions and 2,474 deletions.
diff --git a/.github/workflows/Ngrokit.yml b/.github/workflows/Ngrokit.yml
@@ -37,6 +37,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files
         with:
+          search-paths: ./Packages/Ngrokit/.build
           fail-on-empty-output: true
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4       
@@ -100,6 +101,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-spm
         with:
+          search-paths: ./Packages/Ngrokit/.build
           fail-on-empty-output: true
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4        

diff --git a/.github/workflows/SublimationBonjour.yml b/.github/workflows/SublimationBonjour.yml
@@ -37,6 +37,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files
         with:
+          search-paths: ./Packages/SublimationBonjour/.build
           fail-on-empty-output: true
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4       
@@ -100,6 +101,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-spm
         with:
+          search-paths: ./Packages/SublimationBonjour/.build
           fail-on-empty-output: true
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4        
@@ -113,7 +115,7 @@ jobs:
         run: ./scripts/lint.sh
         if: startsWith(matrix.xcode,'/Applications/Xcode_16.0')
       - name: Run iOS target tests
-        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }}-Package -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
+        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-iOS
         with:
@@ -127,7 +129,7 @@ jobs:
           files: ${{ join(fromJSON(steps.coverage-files-iOS.outputs.files), ',') }}   
           flags: iOS,iOS${{ matrix.iOSVersion }},macOS,${{ env.XCODE_NAME }}  
       - name: Run watchOS target tests
-        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }}-Package -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
+        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-watchOS
         with:

diff --git a/.github/workflows/SublimationNgrok.yml b/.github/workflows/SublimationNgrok.yml
@@ -37,6 +37,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files
         with:
+          search-paths: ./Packages/SublimationNgrok/.build
           fail-on-empty-output: true
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4       
@@ -100,6 +101,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-spm
         with:
+          search-paths: ./Packages/SublimationNgrok/.build
           fail-on-empty-output: true
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4        
@@ -113,7 +115,7 @@ jobs:
         run: ./scripts/lint.sh
         if: startsWith(matrix.xcode,'/Applications/Xcode_16.0')
       - name: Run iOS target tests
-        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }}-Package -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
+        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-iOS
         with:
@@ -127,7 +129,7 @@ jobs:
           files: ${{ join(fromJSON(steps.coverage-files-iOS.outputs.files), ',') }}   
           flags: iOS,iOS${{ matrix.iOSVersion }},macOS,${{ env.XCODE_NAME }}  
       - name: Run watchOS target tests
-        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }}-Package -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
+        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-watchOS
         with:

diff --git a/.github/workflows/SublimationService.yml b/.github/workflows/SublimationService.yml
@@ -37,6 +37,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files
         with:
+          search-paths: ./Packages/SublimationService/.build
           fail-on-empty-output: true
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4       
@@ -100,6 +101,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-spm
         with:
+          search-paths: ./Packages/SublimationService/.build
           fail-on-empty-output: true
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4        
@@ -113,7 +115,7 @@ jobs:
         run: ./scripts/lint.sh
         if: startsWith(matrix.xcode,'/Applications/Xcode_16.0')
       - name: Run iOS target tests
-        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }}-Package -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
+        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-iOS
         with:
@@ -127,7 +129,7 @@ jobs:
           files: ${{ join(fromJSON(steps.coverage-files-iOS.outputs.files), ',') }}   
           flags: iOS,iOS${{ matrix.iOSVersion }},macOS,${{ env.XCODE_NAME }}  
       - name: Run watchOS target tests
-        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }}-Package -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
+        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-watchOS
         with:

diff --git a/.github/workflows/SublimationVapor.yml b/.github/workflows/SublimationVapor.yml
@@ -36,6 +36,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files
         with:
+          search-paths: ./Packages/SublimationVapor/.build
           fail-on-empty-output: true
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4       
@@ -99,6 +100,7 @@ jobs:
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-spm
         with:
+          search-paths: ./Packages/SublimationVapor/.build
           fail-on-empty-output: true
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4        
@@ -112,7 +114,7 @@ jobs:
         run: ./scripts/lint.sh
         if: startsWith(matrix.xcode,'/Applications/Xcode_16.0')
       - name: Run iOS target tests
-        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }}-Package -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
+        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-iOS
         with:
@@ -126,7 +128,7 @@ jobs:
           files: ${{ join(fromJSON(steps.coverage-files-iOS.outputs.files), ',') }}   
           flags: iOS,iOS${{ matrix.iOSVersion }},macOS,${{ env.XCODE_NAME }}  
       - name: Run watchOS target tests
-        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }}-Package -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
+        run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
       - uses: sersoft-gmbh/swift-coverage-action@v4
         id: coverage-files-watchOS
         with:

diff --git a/.gitignore b/.gitignore
@@ -142,3 +142,5 @@ xcuserdata
 !Demo/SublimationDemoApp.xcodeproj
 .mint
 # End of https://www.toptal.com/developers/gitignore/api/swift,swiftpm,swiftpackagemanager,xcode,macos
+
+test_output.log
diff --git a/Demo/SublimationDemoServer/Package.resolved b/Demo/SublimationDemoServer/Package.resolved
@@ -36,33 +36,6 @@
         "version" : "4.5.2"
       }
     },
-    {
-      "identity" : "prch",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/brightdigit/Prch.git",
-      "state" : {
-        "revision" : "600b49cc7a77271ea3d2a9f9e449be081562a087",
-        "version" : "0.2.1"
-      }
-    },
-    {
-      "identity" : "prchnio",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/brightdigit/PrchNIO.git",
-      "state" : {
-        "revision" : "337d0b2f77b0c4ad5b5b3bad6768a9ecd70b003c",
-        "version" : "0.2.0-beta.1"
-      }
-    },
-    {
-      "identity" : "prchvapor",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/brightdigit/PrchVapor.git",
-      "state" : {
-        "revision" : "8c19c645f9c2763014885e42a42096ae61da636b",
-        "version" : "0.2.0-beta.2"
-      }
-    },
     {
       "identity" : "routing-kit",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -60,6 +60,10 @@ let package = Package(
         .product(name: "Logging", package: "swift-log")
       ],
       swiftSettings: swiftSettings
+    ),
+    .testTarget(
+      name: "SublimationTests",
+      dependencies: ["Sublimation"]
     )
   ]
 )

diff --git a/Packages/Ngrokit/Package.swift b/Packages/Ngrokit/Package.swift
@@ -38,7 +38,8 @@ let package = Package(
     .macCatalyst(.v17)
   ],
   products: [
-    .library(name: "Ngrokit", targets: ["Ngrokit"])
+    .library(name: "Ngrokit", targets: ["Ngrokit"]),
+    .library(name: "NgrokitMocks", targets: ["NgrokitMocks"])
   ],
   dependencies: [
     .package(
@@ -60,6 +61,15 @@ let package = Package(
         .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime")
       ],
       swiftSettings: swiftSettings
+    ),
+    .target(
+      name: "NgrokitMocks",
+      dependencies: ["Ngrokit"],
+      swiftSettings: swiftSettings
+    ),
+    .testTarget(
+      name: "NgrokitTests",
+      dependencies: ["Ngrokit", "NgrokitMocks"]
     )
   ]
 )

diff --git a/Packages/Ngrokit/Scripts/lint.sh b/Packages/Ngrokit/Scripts/lint.sh
@@ -13,10 +13,10 @@ MINT_RUN="/opt/homebrew/bin/mint run $MINT_ARGS"
 if [ -z "$SRCROOT" ]; then
 	SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 	PACKAGE_DIR="${SCRIPT_DIR}/.."
-	PERIPHERY_OPTIONS="--skip-build"
-else
-	PACKAGE_DIR="${SRCROOT}" 	
 	PERIPHERY_OPTIONS=""
+else
+	PACKAGE_DIR="${SRCROOT}" 
+	PERIPHERY_OPTIONS="--skip-build"
 fi
 
 
@@ -32,6 +32,10 @@ fi
 
 echo "LINT Mode is $LINT_MODE"
 
+if [ "$LINT_MODE" == "INSTALL" ]; then
+	exit
+fi
+
 if [ -z "$CI" ]; then
 	$MINT_RUN swift-format format --recursive --parallel --in-place $PACKAGE_DIR/Sources
 else