Skip to content

Commit a33295c

Browse files
authored
fix: Build for Swift 5.x on Linux (#76)
* Update Dockerfile * update CI to latest versions of Xcode and Swift * Update release.yml * Update release.yml * Update ci.yml * Update ci.yml * Revert linux in CI * Update Dockerfile * Update release.yml
1 parent 4742807 commit a33295c

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ on:
88
branches: [ main ]
99

1010
env:
11-
CI_XCODE: '/Applications/Xcode_15.4.app/Contents/Developer'
11+
CI_XCODE: '/Applications/Xcode_16.2.app/Contents/Developer'
1212

1313
concurrency:
1414
group: ${{ github.workflow }}-${{ github.ref }}
1515
cancel-in-progress: true
1616

1717
jobs:
1818
spm-test:
19-
runs-on: macos-14
19+
runs-on: macos-15
2020
steps:
2121
- uses: actions/checkout@v4
2222
- name: Install SwiftLint
@@ -33,6 +33,7 @@ jobs:
3333
with:
3434
format: lcov
3535
search-paths: ./.build
36+
ignore-conversion-failures: true
3637
env:
3738
DEVELOPER_DIR: ${{ env.CI_XCODE }}
3839
- name: Upload coverage to Codecov
@@ -69,7 +70,7 @@ jobs:
6970

7071
docs:
7172
timeout-minutes: 20
72-
runs-on: macos-14
73+
runs-on: macos-15
7374
steps:
7475
- uses: actions/checkout@v4
7576
- name: Generate Docs

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
types: [published]
55

66
env:
7-
CI_XCODE: '/Applications/Xcode_15.4.app/Contents/Developer'
7+
CI_XCODE: '/Applications/Xcode_16.2.app/Contents/Developer'
88

99
jobs:
1010
docs:
11-
runs-on: macos-14
11+
runs-on: macos-15
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Build and Deploy Docs

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ================================
22
# Build image
33
# ================================
4-
FROM swift:6.0-jammy as build
4+
FROM swift:5.10-jammy as build
55

66
# Install OS updates and, if needed, sqlite3
77
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
@@ -47,7 +47,7 @@ RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w
4747
# ================================
4848
# Run image
4949
# ================================
50-
FROM swift:6.0-jammy-slim
50+
FROM swift:5.10-jammy-slim
5151

5252
# Make sure all system packages are up to date, and install only essential packages.
5353
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \

0 commit comments

Comments
 (0)