Skip to content

Commit 80fc214

Browse files
authored
Update Swift for hylo to version 5.10 (#83)
* Fix Hylo builds by updating Swift version to 5.10 I also updated the repository name, so that it points to the renamed hylo/hylo repository (old name was hylo/hyloc). * Update README.md to reduce chances for confusion --------- Co-authored-by: Ambrus Toth <[email protected]>
1 parent 09649e4 commit 80fc214

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Dockerfile.hylo

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ RUN mkdir /root/.ssh \
3737
RUN git clone https://github.com/compiler-explorer/infra /opt/compiler-explorer/infra
3838

3939
RUN cd /opt/compiler-explorer/infra && make ce
40-
RUN /opt/compiler-explorer/infra/bin/ce_install install 'swift 5.9'
41-
ENV PATH="${PATH}:/opt/compiler-explorer/swift-5.9/usr/bin"
40+
RUN /opt/compiler-explorer/infra/bin/ce_install install 'swift 5.10'
41+
ENV PATH="${PATH}:/opt/compiler-explorer/swift-5.10/usr/bin"
4242

4343
RUN mkdir -p /root
4444
COPY hylo /root/

README.md

+12-7
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,27 @@ the docker images used to build some of the more...esoteric...tools used on the
66
For example, it builds the 6502 compiler.
77

88
It's in the process of being broken into smaller docker files, and/or separate repos as appropriate.
9-
What "as appropriate" means is stlil being workde on. Each dockerfile is for one group of related
9+
What "as appropriate" means is still being worked on. Each dockerfile is for one group of related
1010
things, building a `XXX-builder` for the `Dockerfile.XXX` file. The `misc` Dockerfile itself is
1111
for the super misc-y things that really only are one-off, though that's still being split up.
1212

1313
If you add a new Dockerfile, you'll need to edit the matrix in the `.github/workflows/build.yml` file.
1414

1515
# Testing locally
1616

17-
Note: make sure you `chmod +x build/build-yourcompiler.sh` first
17+
Note: make sure you `chmod +x yourlanguage/build-yourcompiler.sh` first.
1818

19-
```
19+
```shell
20+
# Building the Docker image with tag `builder`
2021
docker build -t builder -f Dockerfile.misc .
22+
23+
# Running the build script in the container directly
2124
docker run --rm -v/tmp/out:/build builder ./build-yourcompiler.sh trunk /build
22-
```
2325

24-
### Alternative to run (for better debugging)
26+
# Alternative to running the build script
27+
# (It first starts a bash terminal inside the container, so it's easier for debugging.)
28+
docker run -t -i miscbuilder bash
29+
./build-yourcompiler.sh trunk /build
30+
```
2531

26-
* `docker run -t -i miscbuilder bash`
27-
* `./build-yourcompiler.sh trunk`
32+
> Note: Different compiler builder scripts may require different command line arguments, check your script for details.

hylo/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source common.sh
99

1010
ROOT=$(pwd)
1111
VERSION=$1
12-
URL="https://github.com/hylo-lang/hyloc"
12+
URL="https://github.com/hylo-lang/hylo"
1313

1414
if echo "${VERSION}" | grep 'trunk'; then
1515
VERSION=trunk-$(date +%Y%m%d)

0 commit comments

Comments
 (0)