diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index 865d5192..1d0b4252 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch] jobs: macOS: - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v2 - name: Build and Test for macOS @@ -16,7 +16,7 @@ jobs: xcrun llvm-cov export -ignore-filename-regex="pb\.swift|grpc\.swift" -format="lcov" .build/debug/opentelemetry-swiftPackageTests.xctest/Contents/MacOS/opentelemetry-swiftPackageTests -instr-profile .build/debug/codecov/default.profdata > .build/debug/codecov/coverage_report.lcov ./codecov -f .build/debug/codecov/coverage_report.lcov iOS: - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v2 - name: Install Homebrew kegs @@ -26,7 +26,7 @@ jobs: - name: Test for iOS run: make test-without-building-ios tvOS: - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v2 - name: Install Homebrew kegs @@ -36,7 +36,7 @@ jobs: - name: Test for tvOS run: make test-without-building-tvos watchOS: - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v2 - name: Install Homebrew kegs @@ -53,4 +53,4 @@ jobs: - name: Build tests for Linux run: swift build --build-tests - name: Run tests for Linux - run: swift test \ No newline at end of file + run: swift test diff --git a/Makefile b/Makefile index cac2f142..ab0fb8fd 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PROJECT_NAME="opentelemetry-swift-Package" XCODEBUILD_OPTIONS_IOS=\ -configuration Debug \ - -destination platform='iOS Simulator,name=iPhone 15,OS=latest' \ + -destination platform='iOS Simulator,name=iPhone 16,OS=18.2' \ -scheme $(PROJECT_NAME) \ -test-iterations 5 \ -retry-tests-on-failure \ @@ -18,7 +18,7 @@ XCODEBUILD_OPTIONS_TVOS=\ XCODEBUILD_OPTIONS_WATCHOS=\ -configuration Debug \ - -destination platform='watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=latest' \ + -destination platform='watchOS Simulator,name=Apple Watch Series 10 (46mm),OS=11.2' \ -scheme $(PROJECT_NAME) \ -test-iterations 5 \ -retry-tests-on-failure \ @@ -50,7 +50,7 @@ build-for-testing-tvos: .PHONY: build-for-testing-watchos build-for-testing-watchos: - set -o pipefail && xcodebuild $(XCODEBUILD_OPTIONS_WATCHOS) build-for-testing | xcbeautify + set -o pipefail && xcodebuild OTHER_LDFLAGS="$(OTHER_LDFLAGS) -fprofile-instr-generate" $(XCODEBUILD_OPTIONS_WATCHOS) build-for-testing | xcbeautify .PHONY: test-ios test-ios: