Skip to content

Commit 2152706

Browse files
committed
Merge remote-tracking branch 'origin/master' into jflan/pipe-overfill
2 parents 19a96f6 + 164c4d2 commit 2152706

File tree

13 files changed

+213
-228
lines changed

13 files changed

+213
-228
lines changed

.github/workflows/ci.yml

Lines changed: 92 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,51 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
test-on-macos-12:
16-
name: Test on macOS 12
17-
runs-on: macOS-12
15+
test-on-macos-13:
16+
name: Test on macOS 13
17+
runs-on: macOS-13
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
xcode: ["13.2.1", "13.4.1", "14.1"]
21+
xcode: ["14.3.1"]
22+
steps:
23+
- uses: actions/checkout@v2
24+
25+
- name: Cache dependencies
26+
uses: actions/cache@v2
27+
with:
28+
path: |
29+
.build/artifacts
30+
.build/checkouts
31+
.build/repositories
32+
key: ${{ runner.os }}-dependencies-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
33+
restore-keys: |
34+
${{ runner.os }}-dependencies-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
35+
${{ runner.os }}-dependencies-${{ matrix.xcode }}-
36+
37+
- name: Select Xcode
38+
run: |
39+
xcodebuild -version
40+
ls -nt /Applications/ | grep "Xcode*"
41+
sudo xcode-select -switch /Applications/Xcode_${{ matrix.xcode }}.app
42+
xcodebuild -version
43+
44+
- name: Install danger-js
45+
run: brew install danger/tap/danger-js
46+
47+
- run: swift test
48+
49+
- run: swift run danger-swift ci --verbose --failOnErrors
50+
if: ${{ github.event_name == 'pull_request' }}
51+
env:
52+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53+
test-on-macos-14:
54+
name: Test on macOS 14
55+
runs-on: macOS-14
56+
strategy:
57+
fail-fast: false
58+
matrix:
59+
xcode: ["15.2", "15.4"]
2260
steps:
2361
- uses: actions/checkout@v2
2462

@@ -53,11 +91,11 @@ jobs:
5391

5492
test-dependencies-resolver:
5593
name: Test dependencies resolver
56-
runs-on: macOS-12
94+
runs-on: macOS-14
5795
strategy:
5896
fail-fast: false
5997
matrix:
60-
xcode: ["13.2.1", "13.4.1", "14.1"]
98+
xcode: ["15.2", "15.4"]
6199
steps:
62100
- uses: actions/checkout@v2
63101

@@ -83,7 +121,7 @@ jobs:
83121
- name: Install danger-js
84122
run: brew install danger/tap/danger-js
85123

86-
- run: make install
124+
- run: make install PREFIX='/opt/homebrew'
87125

88126
- run: mkdir DangerTestWithDependencies && mv DangerfileWithDependencies.swift DangerTestWithDependencies/Dangerfile.swift
89127

@@ -94,11 +132,11 @@ jobs:
94132

95133
test-on-linux:
96134
name: Test on Linux
97-
runs-on: ubuntu-20.04
135+
runs-on: ubuntu-22.04
98136
strategy:
99137
fail-fast: false
100138
matrix:
101-
swift: ["5.5.3", "5.6.3", "5.7"]
139+
swift: ["5.8", "5.9", "5.10"]
102140
steps:
103141
- uses: actions/checkout@v2
104142
- uses: actions/setup-node@v2
@@ -131,13 +169,13 @@ jobs:
131169
env:
132170
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
133171

134-
test-without-spm-on-macos-12:
135-
name: Test without SPM on macOS 12
136-
runs-on: macOS-12
172+
test-without-spm-on-macos-13:
173+
name: Test without SPM on macOS 13
174+
runs-on: macOS-13
137175
strategy:
138176
fail-fast: false
139177
matrix:
140-
xcode: ["13.2.1", "13.4.1", "14.1"]
178+
xcode: ["14.3.1"]
141179
steps:
142180
- uses: actions/checkout@v2
143181

@@ -170,13 +208,52 @@ jobs:
170208
env:
171209
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
172210

211+
test-without-spm-on-macos-14:
212+
name: Test without SPM on macOS 14
213+
runs-on: macOS-14
214+
strategy:
215+
fail-fast: false
216+
matrix:
217+
xcode: ["15.2", "15.4"]
218+
steps:
219+
- uses: actions/checkout@v2
220+
221+
- name: Cache dependencies
222+
uses: actions/cache@v2
223+
with:
224+
path: |
225+
.build/artifacts
226+
.build/checkouts
227+
.build/repositories
228+
key: ${{ runner.os }}-without-spm-package-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
229+
restore-keys: |
230+
${{ runner.os }}-without-spm-package-${{ matrix.xcode }}-${{ hashFiles('**/Package.resolved') }}
231+
${{ runner.os }}-without-spm-package-${{ matrix.xcode }}-
232+
233+
- name: Select Xcode
234+
run: |
235+
xcodebuild -version
236+
ls -nt /Applications/ | grep "Xcode*"
237+
sudo xcode-select -switch /Applications/Xcode_${{ matrix.xcode }}.app
238+
xcodebuild -version
239+
240+
- name: Install danger-js
241+
run: brew install danger/tap/danger-js
242+
243+
- run: make install PREFIX='/opt/homebrew'
244+
245+
- run: danger-swift ci --verbose --failOnErrors
246+
if: ${{ github.event_name == 'pull_request' }}
247+
env:
248+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
249+
173250
test-without-spm-on-linux:
174251
name: Test without SPM on Linux
175-
runs-on: ubuntu-20.04
252+
runs-on: ubuntu-22.04
176253
strategy:
177254
fail-fast: false
178255
matrix:
179-
swift: ["5.5.3", "5.6.3", "5.7"]
256+
swift: ["5.8", "5.9", "5.10"]
180257
steps:
181258
- uses: actions/checkout@v2
182259
- uses: actions/setup-node@v2

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.5
1+
5.10

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515

1616
- Drain stdout while shell commands are running to prevent execution from locking up if there's too much output [@jflan-dd][] - [#614](https://github.com/danger/swift/pull/614)
1717

18+
## 3.19.1
19+
20+
- Expose markdownKit on Swiftlint.lint() for customizing the output [@nikoloutsos][] - [#609](https://github.com/danger/swift/pull/609)
21+
- Drop Swift 5.7 [@417-72KI][] - [#620](https://github.com/danger/swift/pull/620)
22+
- Fix pattern for detecting SwiftLint in package [@417-72KI][] - [#616](https://github.com/danger/swift/pull/616)
23+
- Allow optional GitLab MR description [@kvvzr][] - [#609](https://github.com/danger/swift/pull/609)
24+
1825
## 3.18.1
1926

2027
- Update Node version to 18.x [@hasanabuzayed][] - [#607](https://github.com/danger/swift/pull/607)

0 commit comments

Comments
 (0)