Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 68ed266

Browse files
committedNov 22, 2022
Use dotnet run for now
Using the compiler directly worked, but it randomly broke. We don't have the time to dig deeper, and `dotnet run` is not too bad.
1 parent 424144d commit 68ed266

File tree

4 files changed

+5
-40
lines changed

4 files changed

+5
-40
lines changed
 

‎Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,8 @@ RUN set -ex; \
2727
dotnet restore; \
2828
# Copy all the necessary files to bin/
2929
dotnet build --no-restore; \
30-
# Remove obj/ to get the verbose output to extract reference paths
31-
rm -rf bin/Debug/net6.0/run.pdb obj; \
32-
# Append reference paths to `cnfig.rsp`
33-
dotnet run --verbosity normal | grep '\-r:' >> config.rsp; \
3430
# Sanity check
35-
fsc @config.rsp Preloaded.fs Solution.fs Tests.fs Program.fs; \
36-
dotnet bin/Debug/net6.0/run.dll; \
31+
dotnet run; \
3732
# Remove examples
3833
rm Preloaded.fs Solution.fs Tests.fs bin/Debug/net6.0/run.dll;
3934

‎bin/run

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ fi
88
W=/workspace
99

1010
# Create container
11-
# Note that Program.fs must come last
12-
C=$(docker container create --rm -w $W $IMAGE sh -c "fsc @config.rsp Preloaded.fs Solution.fs Tests.fs Program.fs && dotnet run bin/Debug/net6.0/run.dll")
11+
C=$(docker container create --rm -w $W $IMAGE dotnet run)
1312

1413
# Copy files from the examples directory
1514
docker container cp examples/${1:-passing}/. $C:$W

‎workspace/config.rsp

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎workspace/run.fsproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9+
<Compile Include="Preloaded.fs" />
10+
<Compile Include="Solution.fs" />
11+
<Compile Include="Tests.fs" />
912
<Compile Include="Program.fs" />
1013
</ItemGroup>
1114

0 commit comments

Comments
 (0)
Please sign in to comment.