diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 636b273b3c..6a9f3ec808 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -28,7 +28,6 @@ concurrency: cancel-in-progress: true permissions: contents: read - checks: write jobs: Framework: @@ -80,13 +79,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: ${{ matrix.name }} - run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project GRDB.xcodeproj -scheme GRDB -destination "${{ matrix.destination }}" -resultBundlePath TestResults.xcresult OTHER_SWIFT_FLAGS='$(inherited) -D SQLITE_ENABLE_FTS5 -D SQLITE_ENABLE_PREUPDATE_HOOK' GCC_PREPROCESSOR_DEFINITIONS='$(inherited) GRDB_SQLITE_ENABLE_PREUPDATE_HOOK=1' clean test - - uses: kishikawakatsumi/xcresulttool@v1 - with: - path: TestResults.xcresult - show-passed-tests: false - show-code-coverage: false - if: success() || failure() + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project GRDB.xcodeproj -scheme GRDB -destination "${{ matrix.destination }}" OTHER_SWIFT_FLAGS='$(inherited) -D SQLITE_ENABLE_FTS5 -D SQLITE_ENABLE_PREUPDATE_HOOK' GCC_PREPROCESSOR_DEFINITIONS='$(inherited) GRDB_SQLITE_ENABLE_PREUPDATE_HOOK=1' clean test SPM: name: SPM runs-on: ${{ matrix.runsOn }} @@ -133,12 +126,6 @@ jobs: - uses: actions/checkout@v4 - name: ${{ matrix.name }} run: make test_framework_SQLCipher3Encrypted - - uses: kishikawakatsumi/xcresulttool@v1 - with: - path: Tests/CocoaPods/SQLCipher3/TestResults_encrypted.xcresult - show-passed-tests: false - show-code-coverage: false - if: success() || failure() SQLCipher4: name: SQLCipher4 runs-on: ${{ matrix.runsOn }} @@ -159,12 +146,6 @@ jobs: - uses: actions/checkout@v4 - name: ${{ matrix.name }} run: make test_framework_SQLCipher4Encrypted - - uses: kishikawakatsumi/xcresulttool@v1 - with: - path: Tests/CocoaPods/SQLCipher4/TestResults_encrypted.xcresult - show-passed-tests: false - show-code-coverage: false - if: success() || failure() CustomSQLite: name: CustomSQLite runs-on: ${{ matrix.runsOn }} @@ -185,12 +166,6 @@ jobs: - uses: actions/checkout@v4 - name: ${{ matrix.name }} run: make test_framework_GRDBCustomSQLiteOSX - - uses: kishikawakatsumi/xcresulttool@v1 - with: - path: TestResults.xcresult - show-passed-tests: false - show-code-coverage: false - if: success() || failure() XCFramework: name: XCFramework runs-on: ${{ matrix.runsOn }} diff --git a/.gitignore b/.gitignore index 76272b80f6..7c7e11035d 100644 --- a/.gitignore +++ b/.gitignore @@ -115,6 +115,3 @@ Tests/SPM/Packages # Test products Tests/products - -# CI -*.xcresult diff --git a/Makefile b/Makefile index 89c9150016..4d5da809e7 100644 --- a/Makefile +++ b/Makefile @@ -81,12 +81,10 @@ test_CocoaPodsLint: test_CocoaPodsLint_GRDB test_demo_apps: test_GRDBDemoiOS test_GRDBCombineDemo test_GRDBAsyncDemo test_framework_GRDBOSX: - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project GRDB.xcodeproj \ -scheme GRDB \ -destination "platform=macOS" \ - -resultBundlePath TestResults.xcresult \ OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \ GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \ $(TEST_ACTIONS) \ @@ -95,92 +93,76 @@ test_framework_GRDBOSX: test_framework_GRDBiOS: test_framework_GRDBiOS_maxTarget test_framework_GRDBiOS_minTarget test_framework_GRDBiOS_maxTarget: - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project GRDB.xcodeproj \ -scheme GRDB \ -destination $(MAX_IOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \ GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \ $(TEST_ACTIONS) \ $(XCPRETTY) test_framework_GRDBiOS_minTarget: - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project GRDB.xcodeproj \ -scheme GRDB \ -destination $(MIN_IOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ $(TEST_ACTIONS) \ $(XCPRETTY) test_framework_GRDBtvOS: test_framework_GRDBtvOS_maxTarget test_framework_GRDBtvOS_minTarget test_framework_GRDBtvOS_maxTarget: - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project GRDB.xcodeproj \ -scheme GRDB \ -destination $(MAX_TVOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \ GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \ $(TEST_ACTIONS) \ $(XCPRETTY) test_framework_GRDBtvOS_minTarget: - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project GRDB.xcodeproj \ -scheme GRDB \ -destination $(MIN_TVOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ $(TEST_ACTIONS) \ $(XCPRETTY) test_framework_GRDBCustomSQLiteOSX: SQLiteCustom - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project GRDBCustom.xcodeproj \ -scheme GRDBCustom \ -destination "platform=macOS" \ - -resultBundlePath TestResults.xcresult \ $(TEST_ACTIONS) \ $(XCPRETTY) test_framework_GRDBCustomSQLiteiOS: test_framework_GRDBCustomSQLiteiOS_maxTarget test_framework_GRDBCustomSQLiteiOS_minTarget test_framework_GRDBCustomSQLiteiOS_maxTarget: SQLiteCustom - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project GRDBCustom.xcodeproj \ -scheme GRDBCustom \ -destination $(MAX_IOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ $(TEST_ACTIONS) \ $(XCPRETTY) test_framework_GRDBCustomSQLiteiOS_minTarget: SQLiteCustom - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project GRDBCustom.xcodeproj \ -scheme GRDBCustom \ -destination $(MIN_IOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ $(TEST_ACTIONS) \ $(XCPRETTY) test_framework_SQLCipher3: ifdef POD cd Tests/CocoaPods/SQLCipher3 && \ - rm -rf TestResults.xcresult && \ $(POD) install && \ $(XCODEBUILD) \ -workspace GRDBTests.xcworkspace \ -scheme GRDBTests \ - -resultBundlePath TestResults.xcresult \ build-for-testing test-without-building \ $(XCPRETTY) else @@ -191,12 +173,10 @@ endif test_framework_SQLCipher3Encrypted: ifdef POD cd Tests/CocoaPods/SQLCipher3 && \ - rm -rf TestResults_encrypted.xcresult && \ $(POD) install && \ $(XCODEBUILD) \ -workspace GRDBTests.xcworkspace \ -scheme GRDBEncryptedTests \ - -resultBundlePath TestResults_encrypted.xcresult \ build-for-testing test-without-building \ $(XCPRETTY) else @@ -207,12 +187,10 @@ endif test_framework_SQLCipher4: ifdef POD cd Tests/CocoaPods/SQLCipher4 && \ - rm -rf TestResults.xcresult && \ $(POD) install && \ $(XCODEBUILD) \ -workspace GRDBTests.xcworkspace \ -scheme GRDBTests \ - -resultBundlePath TestResults.xcresult \ build-for-testing test-without-building \ $(XCPRETTY) else @@ -223,12 +201,10 @@ endif test_framework_SQLCipher4Encrypted: ifdef POD cd Tests/CocoaPods/SQLCipher4 && \ - rm -rf TestResults_encrypted.xcresult && \ $(POD) install && \ $(XCODEBUILD) \ -workspace GRDBTests.xcworkspace \ -scheme GRDBEncryptedTests \ - -resultBundlePath TestResults_encrypted.xcresult \ build-for-testing test-without-building \ $(XCPRETTY) else @@ -393,32 +369,26 @@ else endif test_GRDBDemoiOS: - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project Documentation/DemoApps/GRDBDemoiOS/GRDBDemoiOS.xcodeproj \ -scheme GRDBDemoiOS \ -destination $(MAX_IOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ $(TEST_ACTIONS) \ $(XCPRETTY) test_GRDBCombineDemo: - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo.xcodeproj \ -scheme GRDBCombineDemo \ -destination $(MAX_IOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ $(TEST_ACTIONS) \ $(XCPRETTY) test_GRDBAsyncDemo: - rm -rf TestResults.xcresult $(XCODEBUILD) \ -project Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj \ -scheme GRDBAsyncDemo \ -destination $(MAX_IOS_DESTINATION) \ - -resultBundlePath TestResults.xcresult \ $(TEST_ACTIONS) \ $(XCPRETTY)