Skip to content

Commit fae1111

Browse files
committed
update image, update zig and add valgrind
1 parent fae1e2d commit fae1111

File tree

5 files changed

+24
-12
lines changed

5 files changed

+24
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ results/*.json
55
*.beam
66
*.tasty
77
*.class
8+
*.jar
89
*.json
910
*.o
1011
*.exe

count.zig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ const std = @import("std");
22

33
pub fn main() !void {
44
const allocator = std.heap.page_allocator;
5-
var args = try std.process.argsAlloc(allocator);
5+
const args = try std.process.argsAlloc(allocator);
66
defer std.process.argsFree(allocator, args);
77

8-
var target = try std.fmt.parseInt(u32, args[1], 10);
8+
const target = try std.fmt.parseInt(u32, args[1], 10);
99
var i: u32 = 0;
1010

1111
while (i < target) : (i = (i + 1) | 1) {}
1212

13-
std.debug.print("{}\n", .{i});
13+
var stdout = std.fs.File.stdout().writerStreaming(&.{});
14+
try stdout.interface.print("{}\n", .{i});
1415
}

docker/Dockerfile

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
FROM ubuntu:23.04
1+
FROM ubuntu:25.04
22

33
ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
44

55
RUN apt-get update
6-
RUN apt-get install -y bc build-essential curl gdb lldb git jq moreutils tar \
7-
unzip wget xz-utils valgrind && apt-get clean
6+
RUN apt-get install -y autoconf automake bc bison build-essential curl flex \
7+
gawk gdb git jq libffi-dev libsigsegv-dev libtool lldb moreutils pkg-config \
8+
tar texinfo unzip valgrind wget xz-utils zip && apt-get clean
89
RUN apt-get install -y clang && apt-get clean
910
RUN apt-get install -y default-jdk default-jre && apt-get clean
1011
RUN apt-get install -y erlang && apt-get clean
1112
RUN apt-get install -y fp-compiler && apt-get clean
1213
RUN apt-get install -y ghc && apt-get clean
1314
RUN apt-get install -y gforth && apt-get clean
1415
RUN apt-get install -y gfortran && apt-get clean
15-
RUN apt-get install -y gnu-smalltalk && apt-get clean
1616
RUN apt-get install -y gnucobol3 && apt-get clean
1717
RUN apt-get install -y golang && apt-get clean
1818
RUN apt-get install -y kotlin && apt-get clean
@@ -27,11 +27,20 @@ RUN apt-get install -y swi-prolog && apt-get clean
2727
RUN apt-get install -y tcl && apt-get clean
2828
RUN apt-get install -y valac && apt-get clean
2929

30-
RUN curl -fSL https://packages.microsoft.com/config/ubuntu/23.04/packages-microsoft-prod.deb > packages-microsoft-prod.deb \
30+
# smalltalk no longer included in ubuntu repos
31+
RUN git clone https://github.com/gnu-smalltalk/smalltalk.git /tmp/smalltalk \
32+
&& cd /tmp/smalltalk \
33+
&& autoreconf -vi \
34+
&& ./configure CFLAGS="-O2 -g -std=gnu89" \
35+
&& make \
36+
&& make install \
37+
&& rm -rf /tmp/smalltalk
38+
39+
RUN curl -fSL https://packages.microsoft.com/config/ubuntu/25.04/packages-microsoft-prod.deb > packages-microsoft-prod.deb \
3140
&& dpkg -i packages-microsoft-prod.deb \
3241
&& rm packages-microsoft-prod.deb \
3342
&& apt-get update \
34-
&& apt-get install -y dotnet-sdk-8.0 \
43+
&& apt-get install -y dotnet-sdk-10.0 \
3544
&& apt-get clean
3645

3746
RUN curl -fSL https://deb.nodesource.com/setup_lts.x | bash - \

docker/swift.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ cd "$HOME"
77

88
install_dir="$HOME/.swift"
99

10-
tarball_url="https://download.swift.org/swift-5.9.2-release/ubuntu2204/swift-5.9.2-RELEASE/swift-5.9.2-RELEASE-ubuntu22.04.tar.gz"
10+
11+
tarball_url="https://download.swift.org/swift-6.2.3-release/ubuntu2404/swift-6.2.3-RELEASE/swift-6.2.3-RELEASE-ubuntu24.04.tar.gz"
1112
tarball_sig_url="${tarball_url}.sig"
1213

1314
tarball="swift.tar.gz"

justfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ _all:
3939
just -l | grep -v 'build-all' | grep 'build-' | cut -d'-' -f2- | xargs
4040

4141
build what:
42-
rm -f CMD VERSION STATS SIZE
42+
rm -f CMD VERSION STATS SIZE CYCLES
4343
just build-{{what}}
4444

4545
build-all:
@@ -142,7 +142,7 @@ test what:
142142
cmd="$(cat CMD)"
143143
cmd="${cmd/{{i}}/"$input"}"
144144
echo -n "test: '"$cmd"'"
145-
actual="$($cmd 2>&1 | grep -v '^%' | xargs)"
145+
actual="$($cmd 2>/dev/null | grep -v '^%' | xargs)"
146146
if [[ "$actual" != "$expect" ]]; then
147147
echo " (fail)"
148148
echo "fail, sent '${input}' and expected '${expect}' but got '${actual}'"

0 commit comments

Comments
 (0)