Skip to content

Commit

Permalink
fix: Build for Swift 5.x on Linux (#76)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
cbaker6 authored Dec 25, 2024
1 parent 4742807 commit a33295c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
branches: [ main ]

env:
CI_XCODE: '/Applications/Xcode_15.4.app/Contents/Developer'
CI_XCODE: '/Applications/Xcode_16.2.app/Contents/Developer'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
spm-test:
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- name: Install SwiftLint
Expand All @@ -33,6 +33,7 @@ jobs:
with:
format: lcov
search-paths: ./.build
ignore-conversion-failures: true
env:
DEVELOPER_DIR: ${{ env.CI_XCODE }}
- name: Upload coverage to Codecov
Expand Down Expand Up @@ -69,7 +70,7 @@ jobs:

docs:
timeout-minutes: 20
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- name: Generate Docs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
types: [published]

env:
CI_XCODE: '/Applications/Xcode_15.4.app/Contents/Developer'
CI_XCODE: '/Applications/Xcode_16.2.app/Contents/Developer'

jobs:
docs:
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- name: Build and Deploy Docs
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ================================
# Build image
# ================================
FROM swift:6.0-jammy as build
FROM swift:5.10-jammy as build

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

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

0 comments on commit a33295c

Please sign in to comment.