From aef773bd8d89d2880494aa79b55dc86fe193a74b Mon Sep 17 00:00:00 2001 From: Nour Massri Date: Tue, 6 Jan 2026 14:15:40 -0500 Subject: [PATCH 1/2] modified scaffold for 26, and configs templates --- .../development/configs/compile.template.json | 38 ++++----- .../development/configs/execute.template.json | 82 +++++++++---------- saturn/pkg/run/scaffold.go | 6 +- 3 files changed, 61 insertions(+), 65 deletions(-) diff --git a/saturn/development/configs/compile.template.json b/saturn/development/configs/compile.template.json index d53255cd1..4a36beef6 100644 --- a/saturn/development/configs/compile.template.json +++ b/saturn/development/configs/compile.template.json @@ -1,23 +1,23 @@ { - "episode": { - "name": "bc25java", - "language": "java21", - "scaffold": "https://github.com/battlecode/battlecode25-scaffold" + "episode": { + "name": "bc26", + "language": "java21", + "scaffold": "https://github.com/battlecode/battlecode26-scaffold" + }, + "metadata": { + "report-url": "{{REPORT_PATH}}", + "task-type": "compile" + }, + "details": { + "source": { + "bucket": "local", + "name": "/development/test-data/source/bc26-java21.zip" }, - "metadata": { - "report-url": "{{REPORT_PATH}}", - "task-type": "compile" + "binary": { + "bucket": "local", + "name": "{{BINARY_PATH}}" }, - "details": { - "source": { - "bucket": "local", - "name": "/development/test-data/source/java21.zip" - }, - "binary": { - "bucket": "local", - "name": "{{BINARY_PATH}}" - }, - "team-name": "test", - "package": "examplefuncsplayer" - } + "team-name": "test", + "package": "examplefuncsplayer" + } } diff --git a/saturn/development/configs/execute.template.json b/saturn/development/configs/execute.template.json index 705cdae9d..300a21e83 100644 --- a/saturn/development/configs/execute.template.json +++ b/saturn/development/configs/execute.template.json @@ -1,49 +1,43 @@ { - "episode": { - "name": "bc25java", - "language": "java21", - "scaffold": "https://github.com/battlecode/battlecode25-scaffold" + "episode": { + "name": "bc26", + "language": "java21", + "scaffold": "https://github.com/battlecode/battlecode26-scaffold" + }, + "metadata": { + "report-url": "{{REPORT_PATH}}", + "task-type": "execute" + }, + "details": { + "maps": ["DefaultSmall", "DefaultMedium", "DefaultLarge"], + "replay": { + "bucket": "local", + "name": "{{REPLAY_PATH}}" }, - "metadata": { - "report-url": "{{REPORT_PATH}}", - "task-type": "execute" + "alternate-order": true, + "a": { + "source": { + "bucket": "local", + "name": "/development/test-data/source/bc26-java21.zip" + }, + "binary": { + "bucket": "local", + "name": "/development/test-data/binary/bc26-java21.zip" + }, + "team-name": "test1", + "package": "examplefuncsplayer" }, - "details": { - "maps": [ - "fix", - "galaxy", - "gridworld", - "quack", - "sierpinski" - ], - "replay": { - "bucket": "local", - "name": "{{REPLAY_PATH}}" - }, - "alternate-order": true, - "a": { - "source": { - "bucket": "local", - "name": "/development/test-data/source/java21.zip" - }, - "binary": { - "bucket": "local", - "name": "/development/test-data/binary/java21.zip" - }, - "team-name": "test1", - "package": "examplefuncsplayer" - }, - "b": { - "source": { - "bucket": "local", - "name": "/development/test-data/source/java21.zip" - }, - "binary": { - "bucket": "local", - "name": "/development/test-data/binary/java21.zip" - }, - "team-name": "test2", - "package": "examplefuncsplayer" - } + "b": { + "source": { + "bucket": "local", + "name": "/development/test-data/source/bc26-java21.zip" + }, + "binary": { + "bucket": "local", + "name": "/development/test-data/binary/bc26-java21.zip" + }, + "team-name": "test2", + "package": "examplefuncsplayer" } + } } diff --git a/saturn/pkg/run/scaffold.go b/saturn/pkg/run/scaffold.go index 6e8ded598..dd1acd75b 100644 --- a/saturn/pkg/run/scaffold.go +++ b/saturn/pkg/run/scaffold.go @@ -127,14 +127,16 @@ func NewScaffold(ctx context.Context, episode saturn.Episode, repo *git.Reposito return &s.Scaffold, nil case saturn.Java21: // Modern java21 scaffolds store java in the 'java' subdirectory of the scaffold - javaRoot := filepath.Join(root, "java") + // javaRoot := filepath.Join(root, "java") + javaRoot := root s, err := NewJavaScaffold(ctx, episode, repo, javaRoot, "/opt/java/openjdk", onSaturn) if err != nil { return nil, fmt.Errorf("NewJavaScaffold (Java21): %v", err) } return &s.Scaffold, nil case saturn.Python3: - pyRoot := filepath.Join(root, "python") + // pyRoot := filepath.Join(root, "python") + pyRoot := root s, err := NewPython3Scaffold(ctx, episode, repo, pyRoot, "python3.12", onSaturn) if err != nil { return nil, fmt.Errorf("NewPython3Scaffold: %v", err) From a30d8600edb57723ae91bd4edda85266f99b8957 Mon Sep 17 00:00:00 2001 From: Nour Massri Date: Tue, 6 Jan 2026 15:11:31 -0500 Subject: [PATCH 2/2] onsaturn typo fix --- saturn/pkg/run/gcs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/saturn/pkg/run/gcs.go b/saturn/pkg/run/gcs.go index d81513e95..60711a211 100644 --- a/saturn/pkg/run/gcs.go +++ b/saturn/pkg/run/gcs.go @@ -24,7 +24,7 @@ func NewGCSClient(ctx context.Context, onSaturn bool) (*GCSClient, error) { if err != nil { return nil, fmt.Errorf("storage.NewClient: %v", err) } - return &GCSClient{client, false}, nil + return &GCSClient{client, onSaturn}, nil } func (c *GCSClient) GetFile(ctx context.Context, f FileSpecification, w io.Writer) error {