From f03188d293fcd961275e5538206df03d54d6e2d9 Mon Sep 17 00:00:00 2001 From: Andrew Roan Date: Tue, 25 Apr 2023 00:04:04 -0500 Subject: [PATCH 1/4] Breakout linting into own job. Add macos-13 with xcode-14.2 and xcode-14.3 to matrix. update-workflow --- .github/workflows/ci.yml | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d092341..1bb7d69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,22 +10,36 @@ on: workflow_dispatch: jobs: - library: - runs-on: macos-12 + lint: + runs-on: macos-13 environment: default - strategy: - matrix: - platform: [macOS] - xcode: [13.2.1, 13.4.1, '14.0'] - # Swift: 5.5.2, 5.6, 5.7 steps: - uses: actions/checkout@v3 - - name: Select Xcode ${{ matrix.xcode }} - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - name: Format lint run: swiftformat --lint . - name: Lint run: swiftlint . + test: + environment: default + strategy: + matrix: + os: [macos-12, macos-13] + xcode: [13.2.1, 13.4.1, 14.2, 14.3] + # Swift: 5.5.2, 5.6, 5.7, 5.8 + include: + - os: macos-12 + xcode: 13.2.1 + - os: macos-12 + xcode: 13.4.1 + - os: macos-13 + xcode: 14.2 + - os: macos-13 + xcode: 14.3 + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: Select Xcode ${{ matrix.xcode }} + run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - name: Run Tests run: swift test --enable-code-coverage - name: Swift Coverage Report From a33160a3cc68619dd9d3581443802da19f864f20 Mon Sep 17 00:00:00 2001 From: Andrew Roan Date: Tue, 25 Apr 2023 00:04:24 -0500 Subject: [PATCH 2/4] Add default.profraw to gitignore update-workflow --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 95c4320..65bf5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /Packages /*.xcodeproj xcuserdata/ +/.default.profraw \ No newline at end of file From 7a6e4f1882e39cd9a9bea93dab72b812c0162ab0 Mon Sep 17 00:00:00 2001 From: Andrew Roan Date: Tue, 25 Apr 2023 00:05:16 -0500 Subject: [PATCH 3/4] Update dependencies update-workflow --- Package.resolved | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index 5ad877a..5d7ec1d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/pointfreeco/swift-custom-dump.git", "state": { "branch": null, - "revision": "de8ba65649e7ee317b9daf27dd5eebf34bd4be57", - "version": "0.9.1" + "revision": "84b30e1af72e0ffe6dfbfe39d53b8173caacf224", + "version": "0.10.2" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay", "state": { "branch": null, - "revision": "ab8c9f45843694dd16be4297e6d44c0634fd9913", - "version": "0.8.4" + "revision": "4af50b38daf0037cfbab15514a241224c3f62f98", + "version": "0.8.5" } } ] From 345b018b473eed3b504b2108f010a6fb93e39137 Mon Sep 17 00:00:00 2001 From: Andrew Roan Date: Tue, 25 Apr 2023 00:10:19 -0500 Subject: [PATCH 4/4] Use only include list for matrix update-workflow --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bb7d69..7fa71ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,18 +23,15 @@ jobs: environment: default strategy: matrix: - os: [macos-12, macos-13] - xcode: [13.2.1, 13.4.1, 14.2, 14.3] - # Swift: 5.5.2, 5.6, 5.7, 5.8 include: - os: macos-12 - xcode: 13.2.1 + xcode: 13.2.1 # Swift 5.5.2 - os: macos-12 - xcode: 13.4.1 + xcode: 13.4.1 # Swift 5.6 - os: macos-13 - xcode: 14.2 + xcode: 14.2 # Swift 5.7 - os: macos-13 - xcode: 14.3 + xcode: 14.3 # Swift 5.8 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3