Skip to content

Commit a3f4715

Browse files
authored
chore: upgrade tinygo (#371)
1 parent 77b0b30 commit a3f4715

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

bench/bench_go_tinygo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ environments:
5959
- os: linux
6060
compiler: tinygo
6161
version: latest
62-
docker: tinygo/tinygo:0.25.0
62+
docker: tinygo/tinygo
6363
env:
6464
GOAMD64: v3
6565
include: go

bench/bench_java.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ environments:
8585
# run_cmd: openjdk/bin/java -XX:+UseParallelGC -Xlog:all=off app
8686
- os: linux
8787
compiler: openjdk
88-
version: 20
89-
docker: openjdk:20-slim
88+
version: 21
89+
docker: openjdk:21-slim
9090
docker_runtime_dir: /usr/local/openjdk-*
9191
docker_runtime_dir_rename_to: openjdk
9292
include:

bench/tool/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ await ProcessUtils.RunCommandsAsync(
357357
if (useDocker)
358358
{
359359
const string DockerTmpCodeDir = "/tmp/code";
360-
compilerVersionCommand = $"{s_dockerCmd} run --rm -v {tmpDir.FullPath}:{DockerTmpCodeDir} -w {DockerTmpCodeDir} {langEnvConfig.GetEntryPointArgument()} {docker} {compilerVersionCommand}";
360+
compilerVersionCommand = $"{s_dockerCmd} run --user root --rm -v {tmpDir.FullPath}:{DockerTmpCodeDir} -w {DockerTmpCodeDir} {langEnvConfig.GetEntryPointArgument()} {docker} {compilerVersionCommand}";
361361
}
362362
else
363363
{
@@ -422,7 +422,7 @@ await ProcessUtils.RunCommandAsync(
422422
additionalDockerEnv = string.Join(" ", langEnvConfig.Env.Select(p => $"--env {p.Key.Trim()}=\"{p.Value.Trim()}\""));
423423
}
424424

425-
buildCommand = $"{s_dockerCmd} run --rm {additonalDockerVolumn} {additionalDockerEnv} -v {tmpDir.FullPath}:{DockerTmpCodeDir} -w {DockerTmpCodeDir} {langEnvConfig.GetEntryPointArgument()} {docker} {buildCommand.WrapCommandWithShIfNeeded()}";
425+
buildCommand = $"{s_dockerCmd} run --user root --rm {additonalDockerVolumn} {additionalDockerEnv} -v {tmpDir.FullPath}:{DockerTmpCodeDir} -w {DockerTmpCodeDir} {langEnvConfig.GetEntryPointArgument()} {docker} {buildCommand.WrapCommandWithShIfNeeded()}";
426426
await ProcessUtils.RunCommandAsync(
427427
buildCommand,
428428
workingDir: tmpDir.FullPath,
@@ -816,7 +816,7 @@ private static async Task SetupDockerProvidedRuntimeAsync(
816816
Directory.CreateDirectory(dir);
817817
}
818818
const string DockerTmpDir = "/tmp/runtime";
819-
string cmd = $"{s_dockerCmd} run --rm -v {dir}:{DockerTmpDir} -w {DockerTmpDir} {langEnvConfig.GetEntryPointArgument()} {langEnvConfig.Docker}";
819+
string cmd = $"{s_dockerCmd} run --rm --user root -v {dir}:{DockerTmpDir} -w {DockerTmpDir} {langEnvConfig.GetEntryPointArgument()} {langEnvConfig.Docker}";
820820
if (!string.IsNullOrEmpty(langEnvConfig.DockerRuntimeDir))
821821
{
822822
var runtimeDir = langEnvConfig.DockerRuntimeDir;

0 commit comments

Comments
 (0)