Skip to content

Commit

Permalink
Default back to wasm-5.8.0-RELEASE at this moment for docker image
Browse files Browse the repository at this point in the history
Even with 5.8 being the default, users can still use 5.9 by specifying
the toolchain version in the .swift-version file.
  • Loading branch information
kateinoigakukun committed Jan 9, 2024
1 parent 19ec350 commit 5922747
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/swiftwasm/swift:5.9-focal
FROM ghcr.io/swiftwasm/swift:5.8-focal

LABEL maintainer="SwiftWasm Maintainers <hello@swiftwasm.org>"
LABEL Description="Carton is a watcher, bundler, and test runner for your SwiftWasm apps"
Expand All @@ -16,7 +16,7 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
rm -r /var/lib/apt/lists/*

ENV CARTON_ROOT=/root/.carton
ENV CARTON_DEFAULT_TOOLCHAIN=wasm-5.9-SNAPSHOT-2023-08-01-a
ENV CARTON_DEFAULT_TOOLCHAIN=wasm-5.8.0-RELEASE

RUN mkdir -p $CARTON_ROOT/sdk && \
mkdir -p $CARTON_ROOT/sdk/$CARTON_DEFAULT_TOOLCHAIN && \
Expand Down
2 changes: 1 addition & 1 deletion Sources/CartonHelpers/DefaultToolchain.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
// limitations under the License.

// TODO: make this `public let defaultToolchainVersion = "wasm-5.9.0-RELEASE"`
public let defaultToolchainVersion = "wasm-5.9-SNAPSHOT-2023-08-01-a"
public let defaultToolchainVersion = "wasm-5.9-SNAPSHOT-2023-12-12-a"

0 comments on commit 5922747

Please sign in to comment.