Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

swift5: merge eval_ast, fix metadata, use Debian compiler #693

Merged
merged 6 commits into from
Oct 16, 2024

Conversation

asarhaddon
Copy link
Contributor

This implementation is completed, although not listed yet in #657 :-)

@asarhaddon
Copy link
Contributor Author

I wonder why Debian packages swiftlang-dev and Ubuntu does not.
I suggest to echo 'deb https://deb.debian.org/debian testing main' >> /etc/apt/sources.list before apt update.

@kanaka
Copy link
Owner

kanaka commented Oct 14, 2024

@asarhaddon I was able to get the file to build and everything to compile and tests to pass using the following adjustment to the Dockerfile:

diff --git a/impls/swift5/Dockerfile b/impls/swift5/Dockerfile
index 6a8f6f0f..9112426f 100644
--- a/impls/swift5/Dockerfile
+++ b/impls/swift5/Dockerfile
@@ -6,7 +6,6 @@ MAINTAINER Joel Martin <[email protected]>
 # implementations
 ##########################################################

-RUN echo 'deb https://deb.debian.org/debian trixie main' > /etc/apt/sources.list.d/swift-for-mal
 RUN apt-get -y update

 # Required for running tests
@@ -20,5 +19,8 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################

+RUN apt-get -y install curl
+RUN curl -s https://swiftlang.xyz/install.sh | bash
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    libc-dev swiftlang-dev
+    libc-dev swiftlang

However, note that this is actually swiftc version 6. We could probably just rename this implementation to Swift 6.

@kanaka
Copy link
Owner

kanaka commented Oct 14, 2024

For the rpython implementation, I think there is at least a missing comma between "nil" and "false" in the DEBUG-EVAL conditional.

@asarhaddon asarhaddon force-pushed the merge-eval-swift5 branch 5 times, most recently from ebdaca0 to 2de2a31 Compare October 15, 2024 22:14
@kanaka
Copy link
Owner

kanaka commented Oct 15, 2024

I think modifying the .travis.yml file is triggering the full build of all the implementations. I had honestly forgotten that we still had that file. We should just remove it. For now though, I would just revert it so that builds are just for swift6 and we can remove the file separately later.

@kanaka
Copy link
Owner

kanaka commented Oct 15, 2024

BTW, I think you can probably fix the swift6 failure by setting HOME to /mal in the Dockerfile so that it has a place that it can write cache files to.

@kanaka kanaka merged commit 8169615 into kanaka:master Oct 16, 2024
4 checks passed
@asarhaddon asarhaddon deleted the merge-eval-swift5 branch October 16, 2024 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants