Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Commit 978b7bf

Browse files
Merge pull request #28 from GoodNotes/support-swift-5.8.0
Use swift 5.8 toolchain
2 parents 0a193e4 + c9ec379 commit 978b7bf

File tree

3 files changed

+26
-17
lines changed

3 files changed

+26
-17
lines changed

.github/workflows/docker.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
tags: ghcr.io/${{ env.REPOSITORY_LC }}:${{ env.DOCKER_TAG }}
4848
build-args: |
4949
SWIFLINT_DOCKER_IMAGE=ghcr.io/realm/swiftlint:0.46.5
50-
CARTON_TAG=0.17.0
51-
SWIFT_DOCKER_IMAGE=swift:5.7.0-focal
52-
SWIFT_TAG=swift-wasm-5.7.3-RELEASE
53-
SWIFT_FORMAT_TAG=0.50700.0
50+
CARTON_TAG=0.19.1
51+
SWIFT_DOCKER_IMAGE=swift:5.8.0-focal
52+
SWIFT_TAG=swift-wasm-5.8.0-RELEASE
53+
SWIFT_FORMAT_TAG=508.0.1
5454
NODE_VERSION=16.x
5555
OPEN_JDK_VERSION=11
5656
CYPRESS_VERSION=12.3.0

Dockerfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@ RUN apt-get update && apt-get install -y curl
3232
RUN curl -L -v -o binaryen.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_105/binaryen-version_105-x86_64-linux.tar.gz
3333
RUN tar xzvf binaryen.tar.gz
3434

35-
# Install cargo + wasm-snip
36-
RUN apt-get install -y build-essential
37-
RUN curl https://sh.rustup.rs -sSf > rustup.sh
38-
RUN chmod 755 rustup.sh
39-
RUN ./rustup.sh -y
40-
RUN $HOME/.cargo/bin/cargo install wasm-snip
41-
COPY ./ ./
42-
ENV PATH="$PATH:/$HOME/.cargo/bin/"
43-
4435
FROM ubuntu:20.04 as symbolicator-builder
4536

4637
ARG SYMBOLICATOR_VERSION

README.md

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ The collection of tools included are:
2222
```
2323
$ docker build \
2424
--build-arg SWIFLINT_DOCKER_IMAGE=ghcr.io/realm/swiftlint:0.46.5 \
25-
--build-arg CARTON_TAG=0.17.0 \
26-
--build-arg SWIFT_DOCKER_IMAGE=swift:5.7.0-focal \
27-
--build-arg SWIFT_TAG=swift-wasm-5.7.3-RELEASE \
28-
--build-arg SWIFT_FORMAT_TAG=0.50700.0 \
25+
--build-arg CARTON_TAG=0.19.1 \
26+
--build-arg SWIFT_DOCKER_IMAGE=swift:5.8.0-focal \
27+
--build-arg SWIFT_TAG=swift-wasm-5.8.0-RELEASE \
28+
--build-arg SWIFT_FORMAT_TAG=508.0.1 \
2929
--build-arg NODE_VERSION=16.x \
3030
--build-arg OPEN_JDK_VERSION=11 \
3131
--build-arg CYPRESS_VERSION=12.3.0 \
@@ -38,6 +38,24 @@ $ docker build \
3838
## [TAGGED VERSIONS](https://github.com/GoodNotes/swiftwasm-frontend-docker/pkgs/container/swiftwasm-frontend-docker)
3939
Here you are a list of the tagged dockers with the specific tools version included.
4040

41+
### 0.0.28:
42+
43+
- Swift Web Assembly toolchain => `swift-wasm-5.8.0-RELEASE`
44+
- Carton => `0.19.1`
45+
- Binaryen => `105`
46+
- NodeJS => `v16.13.2`
47+
- Npm => `8.1.2`
48+
- Npx => `8.1.2`
49+
- Yarn => `1.22.17`
50+
- SwiftLint => `0.46.5`
51+
- SwiftFormat => `508.0.1`
52+
- Cypress => `12.3.0`
53+
- Brotli => `1.0.9`
54+
- Chrome => `101.0.4951.54`
55+
- ChromeDriver => `101.0.4951.41`
56+
- Firefox => `99.0.1`
57+
- Sentry Symbolicator => `0.5.0`
58+
4159
### 0.0.27:
4260
- Swift Web Assembly toolchain => `swift-wasm-5.7.3-RELEASE`
4361
- Carton => `0.17.0`

0 commit comments

Comments
 (0)