diff options
-rw-r--r-- | build/rules/go/contrib.policy | 2 | ||||
-rw-r--r-- | build/ya.conf.json | 44 | ||||
-rw-r--r-- | build/ymake.core.conf | 4 |
3 files changed, 25 insertions, 25 deletions
diff --git a/build/rules/go/contrib.policy b/build/rules/go/contrib.policy index de514b35c3..8b640d22ee 100644 --- a/build/rules/go/contrib.policy +++ b/build/rules/go/contrib.policy @@ -37,6 +37,6 @@ ALLOW noc/nocauth -> contrib/go/patched/tacplus ALLOW contrib/go/_std/src/cmd -> contrib/go/_std/src/cmd ALLOW contrib/go/_std_1.18/src/cmd -> contrib/go/_std_1.18/src/cmd DENY .* -> contrib/go/_std/src/cmd -DENY .* -> contrib/go/_std_1.18rc1/src/cmd +DENY .* -> contrib/go/_std_1.18/src/cmd DENY .* -> contrib/go/patched/ diff --git a/build/ya.conf.json b/build/ya.conf.json index cbb88c7b3d..de2f9c18d0 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -317,11 +317,11 @@ "gofmt": { "description": "Run gofmt tool (1.17.8)" }, - "go_1.18rc1": { - "description": "Run go tool (1.18rc1)" + "go_1.18": { + "description": "Run go tool (1.18.2)" }, - "gofmt_1.18rc1": { - "description": "Run gofmt tool (1.18rc1)" + "gofmt_1.18": { + "description": "Run gofmt tool (1.18.2)" }, "godoc": { "description": "Arcadia version of godoc" @@ -5557,19 +5557,19 @@ "version": "1.17.8" } }, - "golang_1_18rc1": { + "golang_1.18": { "tools": { - "golang_1.18rc1": { - "bottle": "golang_1.18rc1", - "executable": "golang_1.18rc1" + "golang_1.18": { + "bottle": "golang_1.18", + "executable": "golang_1.18" }, - "go_1.18rc1": { - "bottle": "golang_1.18rc1", - "executable": "go_1.18rc1" + "go_1.18": { + "bottle": "golang_1.18", + "executable": "go_1.18" }, - "gofmt_1.18rc1": { - "bottle": "golang_1.18rc1", - "executable": "gofmt_1.18rc1" + "gofmt_1.18": { + "bottle": "golang_1.18", + "executable": "gofmt_1.18" } }, "platforms": [ @@ -5601,7 +5601,7 @@ ], "params": { "type": "golang", - "version": "1.18rc1" + "version": "1.18.2" } }, "godoc": { @@ -8263,22 +8263,22 @@ ] } }, - "golang_1.18rc1": { + "golang_1.18": { "formula": { "sandbox_id": [ - 1274398277, - 1274384403, - 1274353053, - 1274373626 + 1307768932, + 1306598930, + 1306598927, + 1306598929 ], "match": "GOLANG" }, "executable": { - "go_1.18rc1": [ + "go_1.18": [ "bin", "go" ], - "gofmt_1.18rc1": [ + "gofmt_1.18": [ "bin", "gofmt" ] diff --git a/build/ymake.core.conf b/build/ymake.core.conf index c2a8a6f92c..008de97aad 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -8081,8 +8081,8 @@ GOSTD_VERSION=1.17.8 when ($GOSTD_VERSION == "1.17.8") { GOSTD=contrib/go/_std/src } -elsewhen ($GOSTD_VERSION == "1.18rc1") { - GOSTD=contrib/go/_std_1.18rc1/src +elsewhen ($GOSTD_VERSION == "1.18.2") { + GOSTD=contrib/go/_std_1.18/src } otherwise { GOSTD=__unsupported_go_std_library_version_[$GOSTD_VERSION]__ |