Skip to content

Commit 6a2dc4b

Browse files
committed
Adjust workflows
1 parent 0a5e34e commit 6a2dc4b

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

.github/workflows/release.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,18 @@ jobs:
3030
publish-docs:
3131
needs: check-release
3232
if: ${{ needs.check-release.outputs.should-publish == 'true' }}
33-
runs-on: macos-latest
33+
runs-on: ubuntu-latest
3434
steps:
3535
- uses: maxim-lobanov/[email protected]
3636
if: runner.os == 'macOS'
3737
with:
38-
xcode-version: ^12.4
38+
xcode-version: ^13.0
39+
- name: Install Swift
40+
if: runner.os == 'Linux'
41+
uses: sersoft-gmbh/[email protected]
42+
with:
43+
release-version: 5.6
44+
github-token: ${{secrets.GITHUB_TOKEN}}
3945
- name: Read OS Version
4046
uses: sersoft-gmbh/[email protected]
4147
id: os-version

.github/workflows/swift-test.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ macos-latest, ubuntu-20.04 ]
14-
swift-version: [ 5.4 ]
14+
swift-version: [ 5.5, 5.6 ]
1515

1616
runs-on: ${{matrix.os}}
1717

1818
steps:
1919
- if: runner.os == 'macOS'
2020
uses: maxim-lobanov/[email protected]
2121
with:
22-
xcode-version: ^12.4
22+
xcode-version: ^13.0
2323
- name: Install Swift
2424
if: runner.os == 'Linux'
2525
uses: sersoft-gmbh/[email protected]
@@ -40,6 +40,9 @@ jobs:
4040
key: ${{runner.os}}-${{steps.os-version.outputs.version}}-${{github.repository}}-spm-${{steps.swift-version.outputs.version}}-${{hashFiles('**/Package.resolved')}}
4141
restore-keys: |
4242
${{runner.os}}-${{steps.os-version.outputs.version}}-${{github.repository}}-spm-${{steps.swift-version.outputs.version}}-
43+
- name: Workaround Package.resolved format issues
44+
if: ${{ startsWith(steps.swift-version.outputs.version, '5.5') }}
45+
run: rm -rf Package.resolved
4346
- name: Build & Test
4447
run: swift test -v --parallel --enable-code-coverage
4548
- name: Generate Coverage Files
@@ -72,8 +75,14 @@ jobs:
7275
steps:
7376
- uses: maxim-lobanov/[email protected]
7477
with:
75-
xcode-version: ^12.4
78+
xcode-version: ^13.0
7679
- uses: actions/checkout@v3
80+
- name: Read Swift Version
81+
uses: sersoft-gmbh/[email protected]
82+
id: swift-version
83+
- name: Workaround Package.resolved format issues
84+
if: ${{ startsWith(steps.swift-version.outputs.version, '5.5') }}
85+
run: rm -rf Package.resolved
7786
- uses: sersoft-gmbh/[email protected]
7887
with:
7988
spm-package: './'

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
# Project & Source files
1010
*.swift @ffried
11-
/Package.* @ffried
11+
/Package*.swift @ffried
1212
/Sources/* @ffried
1313
/Tests/* @ffried

0 commit comments

Comments
 (0)