Merge pull request #1025 from WalletConnect/fix/ci/formatter

[CI] removing old workflow and fixing formatter
WalletConnect · Aug 11, 2023 · 7977d7b · 7977d7b
2 parents e7814b3 + 2aba3ef
commit 7977d7b
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 118 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,8 @@ jobs:
 
   prepare:
     needs: authorize
-    runs-on: macos-12
+    runs-on: 
+      group: apple-silicon
     steps:
       - uses: actions/checkout@v3
         with:
@@ -35,7 +36,8 @@ jobs:
 
   test:
     needs: prepare
-    runs-on: macos-12
+    runs-on: 
+      group: apple-silicon
     timeout-minutes: 15
     strategy:
       fail-fast: false

diff --git a/.github/workflows/self_hosted_ci.yml b/.github/workflows/self_hosted_ci.yml
diff --git a/Makefile b/Makefile
@@ -17,8 +17,30 @@ endif
 	@echo "All dependencies was installed"
 
 build_all:
-	set -o pipefail && xcodebuild -scheme "WalletConnect-Package" -destination "platform=iOS Simulator,name=iPhone 11" -derivedDataPath DerivedDataCache -clonedSourcePackagesDirPath ../SourcePackagesCache RELAY_HOST='$(RELAY_HOST)' PROJECT_ID='$(PROJECT_ID)' build-for-testing | xcpretty
-	set -o pipefail && xcodebuild -project "Example/ExampleApp.xcodeproj" -scheme "BuildAll" -destination "platform=iOS Simulator,name=iPhone 11" -derivedDataPath DerivedDataCache -clonedSourcePackagesDirPath ../SourcePackagesCache RELAY_HOST='$(RELAY_HOST)' PROJECT_ID='$(PROJECT_ID)' CAST_HOST='$(CAST_HOST)' JS_CLIENT_API_HOST='$(JS_CLIENT_API_HOST)' build-for-testing | xcpretty
+	set -o pipefail && env NSUnbufferedIO=YES \
+		xcodebuild \
+		-scheme "WalletConnect-Package" \
+		-destination "platform=iOS Simulator,name=iPhone 14" \
+		-derivedDataPath DerivedDataCache \
+		-clonedSourcePackagesDirPath ../SourcePackagesCache \
+		RELAY_HOST='$(RELAY_HOST)' \
+		PROJECT_ID='$(PROJECT_ID)' \
+		build-for-testing \
+		| xcbeautify
+
+	set -o pipefail && env NSUnbufferedIO=YES \
+		xcodebuild \
+		-project "Example/ExampleApp.xcodeproj" \
+		-scheme "BuildAll" \
+		-destination "platform=iOS Simulator,name=iPhone 14" \
+		-derivedDataPath DerivedDataCache \
+		-clonedSourcePackagesDirPath ../SourcePackagesCache \
+		RELAY_HOST='$(RELAY_HOST)' \
+		PROJECT_ID='$(PROJECT_ID)' \
+		CAST_HOST='$(CAST_HOST)' \
+		JS_CLIENT_API_HOST='$(JS_CLIENT_API_HOST)' \
+		build-for-testing \
+		| xcbeautify
 
 echo_ui_tests:
 	echo "EchoUITests disabled"

diff --git a/NotifyTests.xctestplan b/NotifyTests.xctestplan
@@ -9,6 +9,7 @@
     }
   ],
   "defaultOptions" : {
+    "codeCoverage" : false,
     "environmentVariableEntries" : [
       {
         "key" : "RELAY_HOST",

diff --git a/Sources/WalletConnectModal/Modal/ModalSheet.swift b/Sources/WalletConnectModal/Modal/ModalSheet.swift
@@ -177,7 +177,7 @@ extension ModalSheet {
         Button {
             viewModel.onCloseButton()
         } label: {
-            Image(.close)
+            Image(Asset.close)
                 .padding(8)
         }
         .buttonStyle(CircuralIconButtonStyle())

diff --git a/Sources/WalletConnectModal/Resources/Color.swift b/Sources/WalletConnectModal/Resources/Color.swift
@@ -20,17 +20,17 @@ extension Color {
         self.init(asset.rawValue, bundle: .module)
     }
 
-    static let foreground1 = Color(.foreground1)
-    static let foreground2 = Color(.foreground2)
-    static let foreground3 = Color(.foreground3)
-    static let foregroundInverse = Color(.foregroundInverse)
-    static let background1 = Color(.background1)
-    static let background2 = Color(.background2)
-    static let background3 = Color(.background3)
-    static let negative = Color(.negative)
-    static let thickOverlay = Color(.thickOverlay)
-    static let thinOverlay = Color(.thinOverlay)
-    static let accent = Color(.accent)
+    static let foreground1 = Color(AssetColor.foreground1)
+    static let foreground2 = Color(AssetColor.foreground2)
+    static let foreground3 = Color(AssetColor.foreground3)
+    static let foregroundInverse = Color(AssetColor.foregroundInverse)
+    static let background1 = Color(AssetColor.background1)
+    static let background2 = Color(AssetColor.background2)
+    static let background3 = Color(AssetColor.background3)
+    static let negative = Color(AssetColor.negative)
+    static let thickOverlay = Color(AssetColor.thickOverlay)
+    static let thinOverlay = Color(AssetColor.thinOverlay)
+    static let accent = Color(AssetColor.accent)
 }
 
 #if canImport(UIKit)

diff --git a/Sources/Web3Inbox/WebView/WebViewRequestSubscriber.swift b/Sources/Web3Inbox/WebView/WebViewRequestSubscriber.swift
@@ -48,11 +48,15 @@ final class WebViewRequestSubscriber: NSObject, WKScriptMessageHandler {
 }
 
 extension WebViewRequestSubscriber: WKUIDelegate {
-
+
+    #if os(iOS)
+
     @available(iOS 15.0, *)
     func webView(_ webView: WKWebView, requestMediaCapturePermissionFor origin: WKSecurityOrigin, initiatedByFrame frame: WKFrameInfo, type: WKMediaCaptureType, decisionHandler: @escaping (WKPermissionDecision) -> Void) {
         decisionHandler(.grant)
     }
+
+    #endif
 }
 
 extension WebViewRequestSubscriber: WKNavigationDelegate {

diff --git a/run_tests.sh b/run_tests.sh
@@ -74,7 +74,7 @@ if [ -z "$XCTESTRUN" ]; then
         -resultBundlePath "test_results/$SCHEME.xcresult" \
         test \
         | tee ./test_results/xcodebuild.log \
-        | xcpretty --report junit --output ./test_results/report.junit 
+        | xcbeautify --report junit --junit-report-filename report.junit --report-path ./test_results
     )
 else
 
@@ -99,7 +99,7 @@ else
         -resultBundlePath "test_results/$SCHEME.xcresult" \
         test-without-building \
         | tee ./test_results/xcodebuild.log \
-        | xcpretty --report junit --output ./test_results/report.junit
+        | xcbeautify --report junit --junit-report-filename report.junit --report-path ./test_results
     )
 fi