Skip to content

Commit d7ee219

Browse files
committed
Update swift to 6.2
1 parent 8cbe62e commit d7ee219

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
PROJECT=swift-codeserver
2-
SWIFT_VERSION=5.9.2
2+
SWIFT_VERSION=6.2
33

.github/workflows/feature.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- features/*
66

77
env:
8-
SWIFT_VERSION: 5.9.2
8+
SWIFT_VERSION: 6.2
99

1010
jobs:
1111
build:

.github/workflows/nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- main
66

77
env:
8-
SWIFT_VERSION: 5.9.2
8+
SWIFT_VERSION: 6.2
99

1010
jobs:
1111
build:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
types: [published]
55

66
env:
7-
SWIFT_VERSION: 5.9.2
7+
SWIFT_VERSION: 6.2
88

99
jobs:
1010
build:

Dockerfile

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,21 @@ COPY scripts/entrypoint.sh /entrypoint.sh
3333
# ----------------------------------------------------------------------------------------
3434
ARG SWIFT_VERSION
3535
ENV SWIFT_VERSION=${SWIFT_VERSION}
36+
37+
# Install Swift (Swiftly)
38+
# ----------------------------------------------------------------------------------------
39+
WORKDIR /opt/swiftly
40+
RUN curl -o /opt/swiftly/swiftly.tar.gz https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz
41+
RUN tar zxf swiftly.tar.gz && \
42+
./swiftly init --quiet-shell-followup -y && \
43+
./swiftly install --use ${SWIFT_VERSION} && \
44+
. ~/.local/share/swiftly/env.sh && \
45+
hash -r \
46+
RUN echo 'source /root/.local/share/swiftly/env.sh' >> /root/.bashrc
47+
RUN /root/.local/share/swiftly/bin/swift --version
48+
49+
3650
WORKDIR /build
37-
RUN echo "install..."; \
38-
if [ "$(arch)" = "aarch64" ]; then \
39-
ADD_ARCH="-$(arch)"; \
40-
fi; \
41-
echo "Arch: ${ADD_ARCH}"; \
42-
echo "Version: ${SWIFT_VERSION}"; \
43-
if [ -z ${SWIFT_VERSION+x} ]; then \
44-
echo "Swift version is unset."; \
45-
exit 1; \
46-
fi; \
47-
SWIFT_URL="https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2204${ADD_ARCH}/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu22.04${ADD_ARCH}.tar.gz"; \
48-
echo "Swift download from: ${SWIFT_URL}" > /swift_download.txt; \
49-
wget ${SWIFT_URL}; \
50-
tar -xvzf swift-${SWIFT_VERSION}-RELEASE-ubuntu22.04${ADD_ARCH}.tar.gz; \
51-
cd swift-${SWIFT_VERSION}-RELEASE-ubuntu22.04${ADD_ARCH}; \
52-
cp -rv -T ./usr/. /usr; \
53-
cd /; rm -rf /build/__*; ##FIXME
5451

5552
# Install NodeJS
5653
# ----------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)