Skip to content

Commit 658b0d3

Browse files
committed
Unsupport old environments
1 parent a66f01d commit 658b0d3

File tree

12 files changed

+4
-224
lines changed

12 files changed

+4
-224
lines changed

.github/workflows/docker.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ jobs:
1010
matrix:
1111
environment:
1212
- gcc
13-
- gcc-old
1413
- python2
1514
- python3
16-
- python3-old
1715
- rust
1816
fail-fast: false
1917
name: Build & Push sachaos/atcoder-${{ matrix.environment }} Image

cmd/install.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@ var installCmd = &cobra.Command{
3737
}
3838
}
3939

40-
{
41-
env := environment.DefaultOldEnvironmentSelector.Select(language)
42-
if env != nil {
43-
cli, err := client.NewClientWithOpts(client.FromEnv)
44-
if err != nil {
45-
return err
46-
}
47-
48-
err = tester.PrepareImage(cli, context.Background(), env.DockerImage)
49-
if err != nil {
50-
return err
51-
}
52-
}
53-
}
54-
5540
fmt.Println("Preparation completed")
5641

5742
return nil

cmd/languages.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,6 @@ var languagesCmd = &cobra.Command{
2727
}
2828
w.Render()
2929
}
30-
31-
fmt.Println()
32-
fmt.Println("Old Environments")
33-
34-
{
35-
w := tablewriter.NewWriter(os.Stdout)
36-
w.SetHeader([]string{"key", "alias", "name", "image", "note"})
37-
selector := environment.DefaultOldEnvironmentSelector
38-
39-
for _, key := range selector.Keys() {
40-
env := selector.Select(key)
41-
w.Append([]string{env.Key, strings.Join(selector.Aliases(key), ","), env.Language, env.DockerImage, env.Note})
42-
}
43-
w.Render()
44-
}
4530
},
4631
}
4732

cmd/prepare.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,7 @@ var prepareCmd = &cobra.Command{
4343
return err
4444
}
4545

46-
var selector *environment.EnvironmentSelector
47-
if contest.LangVer == atcoder.LangOld {
48-
selector = environment.DefaultOldEnvironmentSelector
49-
} else {
50-
selector = environment.DefaultEnvironmentSelector
51-
}
46+
selector := environment.DefaultEnvironmentSelector
5247

5348
return preparer.Prepare(contest, ".", selector.Select(language), templatePath)
5449
},

cmd/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import (
55
)
66

77
func validateLanguage(lang string) bool {
8-
return environment.DefaultEnvironmentSelector.Has(lang) || environment.DefaultOldEnvironmentSelector.Has(lang)
8+
return environment.DefaultEnvironmentSelector.Has(lang)
99
}

docker/gcc-old/Dockerfile

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

docker/python3-old/Dockerfile

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

lib/atcoder/parse.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func ParseLangVersion(r io.Reader) (string, error) {
9090
doc.Find("option").Each(func(_ int, selection *goquery.Selection) {
9191
val, _ := selection.Attr("value")
9292
if val == "3001" {
93-
result = LangOld
93+
panic("Not supporting old environment")
9494
}
9595

9696
if val == "4001" {

lib/atcoder/types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package atcoder
22

33
const LangNew = "lang"
4-
const LangOld = "oldLang"
54

65
type Contest struct {
76
ID string

lib/environment/init.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
package environment
22

33
var DefaultEnvironmentSelector = NewEnvironmentSelector()
4-
var DefaultOldEnvironmentSelector = NewEnvironmentSelector()
54

65
func init() {
7-
for key, environment := range OldEnvironments {
8-
err := DefaultOldEnvironmentSelector.Add(key, environment)
9-
if err != nil {
10-
panic(err.Error())
11-
}
12-
}
13-
14-
for aliasKey, key := range OldAliases {
15-
err := DefaultOldEnvironmentSelector.AddAlias(aliasKey, key)
16-
if err != nil {
17-
panic(err.Error())
18-
}
19-
}
20-
216
for key, environment := range Environments {
227
err := DefaultEnvironmentSelector.Add(key, environment)
238
if err != nil {

0 commit comments

Comments
 (0)