From 4e541d7605476ae558f51c0841b502afaff056f1 Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Sun, 29 Sep 2024 20:01:26 +0700 Subject: [PATCH 1/2] Update `ci.yml` --- .github/workflows/ci.yml | 99 ++++------------- .../xcschemes/BuilderMacro-Package.xcscheme | 102 ++++++++++++++++++ .../xcschemes/BuilderMacro.xcscheme | 67 ++++++++++++ .../xcschemes/BuilderMacroClient.xcscheme | 90 ++++++++++++++++ 4 files changed, 279 insertions(+), 79 deletions(-) create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro-Package.xcscheme create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro.xcscheme create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/BuilderMacroClient.xcscheme diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d9be20..daf4af5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,6 @@ on: - "Package.swift" - "Source/**" - "Tests/**" - jobs: SwiftLint: runs-on: ubuntu-latest @@ -23,71 +22,54 @@ jobs: with: args: --strict env: - DIFF_BASE: ${{ github.base_ref }} - - - macOS: - name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} - env: - DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" - timeout-minutes: 20 strategy: fail-fast: false matrix: include: + - xcode: "Xcode_16.0" + runsOn: macos-14 + name: "macOS 14, Xcode 16.0, Swift 6.0" + testPlan: "macOS" + - xcode: "Xcode_15.4" + runsOn: macos-14 + name: "macOS 14, Xcode 15.4, Swift 5.10" + testPlan: "macOS" + - xcode: "Xcode_15.2" + runsOn: macos-13 + name: "macOS 14, Xcode 15.2, Swift 5.9.2" + - xcode: "Xcode_15.1" + runsOn: macOS-13 + name: "macOS 14, Xcode 15.1, Swift 5.9.1" + testPlan: "macOS" - xcode: "Xcode_15.0" runsOn: macos-13 name: "macOS 13, Xcode 15.0, Swift 5.9.0" - - xcode: "Xcode_14.3.1" - runsOn: macos-13 - name: "macOS 13, Xcode 14.3.1, Swift 5.8.0" - - xcode: "Xcode_14.2" - runsOn: macOS-12 - name: "macOS 12, Xcode 14.2, Swift 5.7.2" - - xcode: "Xcode_14.1" - runsOn: macOS-12 - name: "macOS 12, Xcode 14.1, Swift 5.7.1" steps: - uses: actions/checkout@v3 - - name: ${{ matrix.name }} - run: xcodebuild test -scheme "{{ cookiecutter.name }}" -destination "platform=macOS" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1 - + run: xcodebuild test -scheme "BuilderMacroClient" -destination "platform=macOS" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1 - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3.1.0 with: - token: ${{ secrets.CODECOV_TOKEN }} - xcode: true - xcode_archive_path: test_output/${{ matrix.name }}.xcresult - - uses: actions/upload-artifact@v4 with: - name: ${{ matrix.name }} - path: test_output - - - iOS: - name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} - env: - DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" - timeout-minutes: 20 strategy: fail-fast: false @@ -103,28 +85,17 @@ jobs: runsOn: macos-13 steps: - uses: actions/checkout@v3 - - name: ${{ matrix.name }} - run: xcodebuild test -scheme "{{ cookiecutter.name }}" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1 - + run: xcodebuild test -scheme "BuilderMacroClient" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1 - uses: actions/upload-artifact@v4 with: - name: ${{ matrix.name }} path: test_output - - - - tvOS: - name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} - env: - DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" - timeout-minutes: 20 strategy: fail-fast: false @@ -140,38 +111,23 @@ jobs: runsOn: macos-13 steps: - uses: actions/checkout@v3 - - name: ${{ matrix.name }} - run: xcodebuild test -scheme "{{ cookiecutter.name }}" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1 - + run: xcodebuild test -scheme "BuilderMacroClient" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1 - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3.1.0 with: - token: ${{ secrets.CODECOV_TOKEN }} - xcode: true - xcode_archive_path: test_output/${{ matrix.name }}.xcresult - - uses: actions/upload-artifact@v4 with: - name: ${{ matrix.name }} - path: test_output - - - watchOS: - name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} - env: - DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" - timeout-minutes: 20 strategy: fail-fast: false @@ -191,37 +147,23 @@ jobs: runsOn: macos-13 steps: - uses: actions/checkout@v3 - - name: ${{ matrix.name }} - run: xcodebuild test -scheme "{{ cookiecutter.name }}" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1 - + run: xcodebuild test -scheme "BuilderMacroClient" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1 - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3.1.0 with: - token: ${{ secrets.CODECOV_TOKEN }} - xcode: true - xcode_archive_path: test_output/${{ matrix.name }}.xcresult - - uses: actions/upload-artifact@v4 with: - name: ${{ matrix.name }} - path: test_output - - spm: - name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} - env: - DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" - timeout-minutes: 20 strategy: fail-fast: false @@ -235,9 +177,8 @@ jobs: runsOn: macos-13 steps: - uses: actions/checkout@v3 - - name: ${{ matrix.name }} - run: swift build -c release --target "{{ cookiecutter.name }}" + run: swift build -c release --target "BuilderMacro" merge-test-reports: needs: [iOS, macOS, watchOS, tvOS] diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro-Package.xcscheme new file mode 100644 index 0000000..d370188 --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro-Package.xcscheme @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro.xcscheme new file mode 100644 index 0000000..b1b7327 --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacro.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacroClient.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacroClient.xcscheme new file mode 100644 index 0000000..fc65e63 --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/BuilderMacroClient.xcscheme @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ff7601a391aa6180c0f3f6619ca32e6024c4c95f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:03:46 +0000 Subject: [PATCH 2/2] Bump github.com/apple/swift-syntax from 510.0.3 to 600.0.1 Bumps [github.com/apple/swift-syntax](https://github.com/apple/swift-syntax) from 510.0.3 to 600.0.1. - [Release notes](https://github.com/apple/swift-syntax/releases) - [Commits](https://github.com/apple/swift-syntax/compare/510.0.3...600.0.1) --- updated-dependencies: - dependency-name: github.com/apple/swift-syntax dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 1809cd0..b655792 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-syntax.git", "state" : { - "revision" : "2bc86522d115234d1f588efe2bcb4ce4be8f8b82", - "version" : "510.0.3" + "revision" : "0687f71944021d616d34d922343dcef086855920", + "version" : "600.0.1" } } ], diff --git a/Package.swift b/Package.swift index ce36c63..7291b77 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.0"), + .package(url: "https://github.com/apple/swift-syntax.git", from: "600.0.1"), ], targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite.