diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 110af90..a8dc0fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,79 +10,64 @@ on: - cron: "0 8,20 * * *" jobs: - unit-tests: - name: Unit tests - uses: apple/swift-nio/.github/workflows/unit_tests.yml@main + tests: + name: Tests + uses: swiftlang/github-workflows/.github/workflows/package_test.yml@0.0.18 with: - linux_6_1_enabled: false - linux_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_6_1_enabled: false - windows_6_2_enabled: true - windows_6_3_enabled: true - windows_6_4_enabled: true - windows_nightly_next_enabled: true - windows_nightly_main_enabled: true - windows_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" + # After https://github.com/swiftlang/github-workflows/pull/362 fix is available, this can be simplified to: + # windows_command: | + # Debug-Test: swift test + # Release-Build: swift build -c release + # windows_version_overrides: | + # default: -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + # nightly-release: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + # nightly-main: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + windows_env_vars: '{"COMMON_SWIFT_FLAGS": "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"}' + windows_command: | + Debug-Test: + command: swift test -Xswiftc -warnings-as-errors %COMMON_SWIFT_FLAGS% + versions: ["current-2", "current-1", "current"] + Release-Build: + command: swift build -c release -Xswiftc -warnings-as-errors %COMMON_SWIFT_FLAGS% + versions: ["current-2", "current-1", "current"] + Debug-Test-Nightly: + command: swift test %COMMON_SWIFT_FLAGS% + versions: ["nightly-release", "nightly-main"] + Release-Build-Nightly: + command: swift build -c release %COMMON_SWIFT_FLAGS% + versions: ["nightly-release", "nightly-main"] + # The Windows runner installs a pinned Swift patch release. The container image tracks the newest patch release. + # Context: https://github.com/swiftlang/github-workflows/issues/356 + windows_use_docker: true + # Strict flags for the release toolchains. The nightly toolchains skip -warnings-as-errors. + linux_version_overrides: | + default: -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + nightly-release: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + nightly-main: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + macos_runner_pool: nightly + xcode_scheme: swift-log-Package + xcode_targets: | + macOS: + build: true + test: true + wasm_sdk_versions: '["current", "nightly-main"]' + enable_embedded_wasm_sdk_build: false + enable_macos_swiftly: false + enable_freebsd: false macos-benchmarks: name: macOS benchmarks - uses: apple/swift-nio/.github/workflows/macos_benchmarks.yml@main + uses: swiftlang/github-workflows/.github/workflows/benchmarks.yml@0.0.18 with: benchmark_package_paths: '["Benchmarks/NoTraits", "Benchmarks/MaxLogLevelWarning", "Benchmarks/MaxLogLevelNone"]' - macos_swift_6_3_enabled: true - macos_swift_6_4_enabled: true + enable_linux: false + enable_macos: true + macos_swift_versions: '["current-1", "current"]' + macos_runner_pool: nightly - cxx-interop: - name: Cxx interop - uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main - - static-linux: - name: Static Linux Swift SDK - # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/static_sdk.yml@main - - macos-tests: - name: macOS tests - uses: apple/swift-nio/.github/workflows/macos_tests.yml@main + cmake-build: + name: CMake build + uses: swiftlang/github-workflows/.github/workflows/cmake_build.yml@0.0.18 with: - runner_pool: nightly - build_scheme: swift-log-Package - swift_6_1_enabled: false - swift_6_2_enabled: true - swift_6_3_enabled: true - swift_6_4_enabled: true - macos_xcode_test_enabled: true - ios_xcode_test_enabled: false - watchos_xcode_test_enabled: false - tvos_xcode_test_enabled: false - visionos_xcode_test_enabled: false - - wasm: - name: Wasm Swift SDK - uses: apple/swift-nio/.github/workflows/wasm_swift_sdk.yml@main - with: - nightly_next_enabled: false - - android: - name: Android Swift SDK - # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/android_swift_sdk.yml@main - - release-builds: - name: Release builds - uses: apple/swift-nio/.github/workflows/release_builds.yml@main - with: - windows_6_1_enabled: false - windows_6_2_enabled: true - windows_6_3_enabled: true - windows_6_4_enabled: true - windows_nightly_next_enabled: true - windows_nightly_main_enabled: true + enable_windows_checks: false + linux_pre_build_command: apt-get update && apt-get install -y ninja-build diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 4e9210a..08c3642 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -10,98 +10,68 @@ on: jobs: soundness: name: Soundness - uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.17 + uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.18 with: license_header_check_project_name: "Swift Logging API" - unit-tests: - name: Unit tests - uses: apple/swift-nio/.github/workflows/unit_tests.yml@main + tests: + name: Tests + uses: swiftlang/github-workflows/.github/workflows/package_test.yml@0.0.18 with: - linux_6_1_enabled: false - linux_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_6_1_enabled: false - windows_6_2_enabled: true - windows_6_3_enabled: true - windows_6_4_enabled: true - windows_nightly_next_enabled: true - windows_nightly_main_enabled: true - windows_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" - windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable" + # After https://github.com/swiftlang/github-workflows/pull/362 fix is available, this can be simplified to: + # windows_command: | + # Debug-Test: swift test + # Release-Build: swift build -c release + # windows_version_overrides: | + # default: -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + # nightly-release: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + # nightly-main: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + windows_env_vars: '{"COMMON_SWIFT_FLAGS": "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"}' + windows_command: | + Debug-Test: + command: swift test -Xswiftc -warnings-as-errors %COMMON_SWIFT_FLAGS% + versions: ["current-2", "current-1", "current"] + Release-Build: + command: swift build -c release -Xswiftc -warnings-as-errors %COMMON_SWIFT_FLAGS% + versions: ["current-2", "current-1", "current"] + Debug-Test-Nightly: + command: swift test %COMMON_SWIFT_FLAGS% + versions: ["nightly-release", "nightly-main"] + Release-Build-Nightly: + command: swift build -c release %COMMON_SWIFT_FLAGS% + versions: ["nightly-release", "nightly-main"] + # The Windows runner installs a pinned Swift patch release. The container image tracks the newest patch release. + # Context: https://github.com/swiftlang/github-workflows/issues/356 + windows_use_docker: true + # Strict flags for the release toolchains. The nightly toolchains skip -warnings-as-errors. + linux_version_overrides: | + default: -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + nightly-release: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + nightly-main: --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable + macos_runner_pool: general + xcode_scheme: swift-log-Package + xcode_targets: | + macOS: + build: true + test: true + wasm_sdk_versions: '["current", "nightly-main"]' + enable_embedded_wasm_sdk_build: false + enable_macos_swiftly: false + enable_freebsd: false macos-benchmarks: name: macOS benchmarks - uses: apple/swift-nio/.github/workflows/macos_benchmarks.yml@main + uses: swiftlang/github-workflows/.github/workflows/benchmarks.yml@0.0.18 with: benchmark_package_paths: '["Benchmarks/NoTraits", "Benchmarks/MaxLogLevelWarning", "Benchmarks/MaxLogLevelNone"]' + enable_linux: false + enable_macos: true + macos_swift_versions: '["current-1", "current"]' macos_runner_pool: general - macos_swift_6_3_enabled: true - macos_swift_6_4_enabled: true - cxx-interop: - name: Cxx interop - uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main - - static-linux: - name: Static Linux Swift SDK - # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/static_sdk.yml@main - - macos-tests: - name: macOS tests - uses: apple/swift-nio/.github/workflows/macos_tests.yml@main + cmake-build: + name: CMake build + uses: swiftlang/github-workflows/.github/workflows/cmake_build.yml@0.0.18 with: - runner_pool: general - build_scheme: swift-log-Package - swift_test_enabled: true - swift_6_1_enabled: false - swift_6_2_enabled: true - swift_6_3_enabled: true - swift_6_4_enabled: true - macos_xcode_test_enabled: true - ios_xcode_test_enabled: false - watchos_xcode_test_enabled: false - tvos_xcode_test_enabled: false - visionos_xcode_test_enabled: false - - android: - name: Android Swift SDK - # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/android_swift_sdk.yml@main - - release-builds: - name: Release builds - uses: apple/swift-nio/.github/workflows/release_builds.yml@main - with: - windows_6_1_enabled: false - windows_6_2_enabled: true - windows_6_3_enabled: true - windows_6_4_enabled: true - windows_nightly_next_enabled: true - windows_nightly_main_enabled: true - - wasm: - name: Wasm Swift SDK - uses: apple/swift-nio/.github/workflows/wasm_swift_sdk.yml@main - with: - nightly_next_enabled: false - - cmake-lists: - name: Check CMake Lists - uses: apple/swift-nio/.github/workflows/cmake_tests.yml@main - with: - image: "swift:6.2-jammy" - update_cmake_lists_config: >- - { - "targets": [ - { "name": "Logging", "type": "source", "exceptions": [] }, - { "name": "InMemoryLogging", "type": "source", "exceptions": [] } - ] - } + enable_windows_checks: false + linux_pre_build_command: apt-get update && apt-get install -y ninja-build diff --git a/.github/workflows/pull_request_label.yml b/.github/workflows/pull_request_label.yml index dfd7dd6..3ec290e 100644 --- a/.github/workflows/pull_request_label.yml +++ b/.github/workflows/pull_request_label.yml @@ -2,6 +2,7 @@ name: PR label permissions: contents: read + pull-requests: read on: pull_request: @@ -10,12 +11,4 @@ on: jobs: semver-label-check: name: Semantic version label check - runs-on: ubuntu-latest - timeout-minutes: 1 - steps: - - name: Checkout repository - uses: actions/checkout@v7 - with: - persist-credentials: false - - name: Check for Semantic Version label - uses: apple/swift-nio/.github/actions/pull_request_semver_label_checker@main + uses: swiftlang/github-workflows/.github/workflows/pull_request_label.yml@0.0.18 diff --git a/Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.3/MaxLogLevelNone.critical_log_with_critical_log_level.p90.json b/Benchmarks/MaxLogLevelNone/Thresholds/6.3/MaxLogLevelNone.critical_log_with_critical_log_level.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.3/MaxLogLevelNone.critical_log_with_critical_log_level.p90.json rename to Benchmarks/MaxLogLevelNone/Thresholds/6.3/MaxLogLevelNone.critical_log_with_critical_log_level.p90.json diff --git a/Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.3/MaxLogLevelNone.critical_log_with_critical_log_level_generic.p90.json b/Benchmarks/MaxLogLevelNone/Thresholds/6.3/MaxLogLevelNone.critical_log_with_critical_log_level_generic.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.3/MaxLogLevelNone.critical_log_with_critical_log_level_generic.p90.json rename to Benchmarks/MaxLogLevelNone/Thresholds/6.3/MaxLogLevelNone.critical_log_with_critical_log_level_generic.p90.json diff --git a/Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.3/MaxLogLevelNone.critical_log_with_critical_log_level_logLevel_set.p90.json b/Benchmarks/MaxLogLevelNone/Thresholds/6.3/MaxLogLevelNone.critical_log_with_critical_log_level_logLevel_set.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.3/MaxLogLevelNone.critical_log_with_critical_log_level_logLevel_set.p90.json rename to Benchmarks/MaxLogLevelNone/Thresholds/6.3/MaxLogLevelNone.critical_log_with_critical_log_level_logLevel_set.p90.json diff --git a/Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.3/MaxLogLevelNone.critical_log_with_critical_log_level_metadata_set.p90.json b/Benchmarks/MaxLogLevelNone/Thresholds/6.3/MaxLogLevelNone.critical_log_with_critical_log_level_metadata_set.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.3/MaxLogLevelNone.critical_log_with_critical_log_level_metadata_set.p90.json rename to Benchmarks/MaxLogLevelNone/Thresholds/6.3/MaxLogLevelNone.critical_log_with_critical_log_level_metadata_set.p90.json diff --git a/Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.4/MaxLogLevelNone.critical_log_with_critical_log_level.p90.json b/Benchmarks/MaxLogLevelNone/Thresholds/6.4/MaxLogLevelNone.critical_log_with_critical_log_level.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.4/MaxLogLevelNone.critical_log_with_critical_log_level.p90.json rename to Benchmarks/MaxLogLevelNone/Thresholds/6.4/MaxLogLevelNone.critical_log_with_critical_log_level.p90.json diff --git a/Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.4/MaxLogLevelNone.critical_log_with_critical_log_level_generic.p90.json b/Benchmarks/MaxLogLevelNone/Thresholds/6.4/MaxLogLevelNone.critical_log_with_critical_log_level_generic.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.4/MaxLogLevelNone.critical_log_with_critical_log_level_generic.p90.json rename to Benchmarks/MaxLogLevelNone/Thresholds/6.4/MaxLogLevelNone.critical_log_with_critical_log_level_generic.p90.json diff --git a/Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.4/MaxLogLevelNone.critical_log_with_critical_log_level_logLevel_set.p90.json b/Benchmarks/MaxLogLevelNone/Thresholds/6.4/MaxLogLevelNone.critical_log_with_critical_log_level_logLevel_set.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.4/MaxLogLevelNone.critical_log_with_critical_log_level_logLevel_set.p90.json rename to Benchmarks/MaxLogLevelNone/Thresholds/6.4/MaxLogLevelNone.critical_log_with_critical_log_level_logLevel_set.p90.json diff --git a/Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.4/MaxLogLevelNone.critical_log_with_critical_log_level_metadata_set.p90.json b/Benchmarks/MaxLogLevelNone/Thresholds/6.4/MaxLogLevelNone.critical_log_with_critical_log_level_metadata_set.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelNone/Thresholds/Xcode swift 6.4/MaxLogLevelNone.critical_log_with_critical_log_level_metadata_set.p90.json rename to Benchmarks/MaxLogLevelNone/Thresholds/6.4/MaxLogLevelNone.critical_log_with_critical_log_level_metadata_set.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.notice_log_with_notice_log_level.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.notice_log_with_notice_log_level.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.notice_log_with_notice_log_level.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.notice_log_with_notice_log_level.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.notice_log_with_notice_log_level_attributed_generic.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.notice_log_with_notice_log_level_attributed_generic.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.notice_log_with_notice_log_level_attributed_generic.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.notice_log_with_notice_log_level_attributed_generic.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.notice_log_with_notice_log_level_generic.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.notice_log_with_notice_log_level_generic.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.notice_log_with_notice_log_level_generic.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.notice_log_with_notice_log_level_generic.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.warning_log_with_warning_log_level.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.warning_log_with_warning_log_level.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.warning_log_with_warning_log_level.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.warning_log_with_warning_log_level.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.warning_log_with_warning_log_level_generic.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.warning_log_with_warning_log_level_generic.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.3/MaxLogLevelWarning.warning_log_with_warning_log_level_generic.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.3/MaxLogLevelWarning.warning_log_with_warning_log_level_generic.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.notice_log_with_notice_log_level.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.notice_log_with_notice_log_level.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.notice_log_with_notice_log_level.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.notice_log_with_notice_log_level.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.notice_log_with_notice_log_level_attributed_generic.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.notice_log_with_notice_log_level_attributed_generic.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.notice_log_with_notice_log_level_attributed_generic.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.notice_log_with_notice_log_level_attributed_generic.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.notice_log_with_notice_log_level_generic.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.notice_log_with_notice_log_level_generic.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.notice_log_with_notice_log_level_generic.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.notice_log_with_notice_log_level_generic.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.warning_log_with_warning_log_level.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.warning_log_with_warning_log_level.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.warning_log_with_warning_log_level.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.warning_log_with_warning_log_level.p90.json diff --git a/Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.warning_log_with_warning_log_level_generic.p90.json b/Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.warning_log_with_warning_log_level_generic.p90.json similarity index 100% rename from Benchmarks/MaxLogLevelWarning/Thresholds/Xcode swift 6.4/MaxLogLevelWarning.warning_log_with_warning_log_level_generic.p90.json rename to Benchmarks/MaxLogLevelWarning/Thresholds/6.4/MaxLogLevelWarning.warning_log_with_warning_log_level_generic.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_error_log_level_1_attribute.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_error_log_level_1_attribute.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_error_log_level_1_attribute.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_error_log_level_1_attribute.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_error_log_level_2_attributes.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_error_log_level_2_attributes.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_error_log_level_2_attributes.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_error_log_level_2_attributes.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_error_log_level_generic.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_error_log_level_generic.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_error_log_level_generic.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_error_log_level_generic.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1000.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1000.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1000.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1000.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_20.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_20.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_20.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_20.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_5.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_5.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_5.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_5.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_1_attribute.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_1_attribute.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_1_attribute.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_1_attribute.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_2_attributes.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_2_attributes.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_2_attributes.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_2_attributes.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_current_read_fallback.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_current_read_fallback.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_current_read_fallback.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_current_read_fallback.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_current_read_inside_scope.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_current_read_inside_scope.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_current_read_inside_scope.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_current_read_inside_scope.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_generic.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_generic.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_generic.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_generic.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json similarity index 52% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json index c280d6d..a40f80b 100644 --- a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json +++ b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json @@ -1,4 +1,4 @@ { - "instructions" : 3696639, + "instructions" : 3273000, "objectAllocCount" : 1000 } \ No newline at end of file diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_withLogger_mergingMetadata.p90.json b/Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_withLogger_mergingMetadata.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.3/NoTraits.error_log_with_error_log_level_withLogger_mergingMetadata.p90.json rename to Benchmarks/NoTraits/Thresholds/6.3/NoTraits.error_log_with_error_log_level_withLogger_mergingMetadata.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_error_log_level_1_attribute.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_error_log_level_1_attribute.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_error_log_level_1_attribute.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_error_log_level_1_attribute.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_error_log_level_2_attributes.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_error_log_level_2_attributes.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_error_log_level_2_attributes.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_error_log_level_2_attributes.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_error_log_level_generic.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_error_log_level_generic.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_error_log_level_generic.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_error_log_level_generic.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1000.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1000.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1000.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_1000.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_20.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_20.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_20.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_20.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_5.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_5.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_5.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.debug_log_with_info_log_level_metadata_nesting_depth_5.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_1_attribute.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_1_attribute.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_1_attribute.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_1_attribute.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_2_attributes.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_2_attributes.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_2_attributes.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_2_attributes.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_current_read_fallback.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_current_read_fallback.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_current_read_fallback.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_current_read_fallback.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_current_read_inside_scope.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_current_read_inside_scope.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_current_read_inside_scope.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_current_read_inside_scope.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_generic.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_generic.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_generic.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_generic.p90.json diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json similarity index 52% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json index f657ea3..92465a1 100644 --- a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json +++ b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_withLogger_handler.p90.json @@ -1,4 +1,4 @@ { - "instructions" : 3264511, + "instructions" : 2841000, "objectAllocCount" : 1000 } \ No newline at end of file diff --git a/Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_withLogger_mergingMetadata.p90.json b/Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_withLogger_mergingMetadata.p90.json similarity index 100% rename from Benchmarks/NoTraits/Thresholds/Xcode swift 6.4/NoTraits.error_log_with_error_log_level_withLogger_mergingMetadata.p90.json rename to Benchmarks/NoTraits/Thresholds/6.4/NoTraits.error_log_with_error_log_level_withLogger_mergingMetadata.p90.json