summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsetser <[email protected]>2022-05-18 14:10:27 +0300
committersetser <[email protected]>2022-05-18 14:10:27 +0300
commit6b67803ea4ab671d856064de45b1f9a69c53213c (patch)
tree62bdcd74173dbddf943a87d97277ad147d1f58bf
parent45898b91b0579de5bd27bca884aa07a66885ae2c (diff)
Switch default Go toolchain to 1.18.2
ref:35d280fdf6dbb851e3fd34e4434566336fd11667
-rw-r--r--build/ya.conf.json40
-rw-r--r--build/ymake.core.conf2
2 files changed, 21 insertions, 21 deletions
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 0dd8ce3e77c..b477980ff37 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -311,16 +311,16 @@
"saas2": {
"description": "Run saas2 cli"
},
- "go": {
+ "go_1.17": {
"description": "Run go tool (1.17.8)"
},
- "gofmt": {
+ "gofmt_1.17": {
"description": "Run gofmt tool (1.17.8)"
},
- "go_1.18": {
+ "go": {
"description": "Run go tool (1.18.2)"
},
- "gofmt_1.18": {
+ "gofmt": {
"description": "Run gofmt tool (1.18.2)"
},
"godoc": {
@@ -5512,17 +5512,17 @@
},
"golang_1_17_8": {
"tools": {
- "golang": {
+ "golang_1.17": {
"bottle": "golang_1.17.8",
- "executable": "golang"
+ "executable": "golang_1.17"
},
- "go": {
+ "go_1.17": {
"bottle": "golang_1.17.8",
- "executable": "go"
+ "executable": "go_1.17"
},
- "gofmt": {
+ "gofmt_1.17": {
"bottle": "golang_1.17.8",
- "executable": "gofmt"
+ "executable": "gofmt_1.17"
}
},
"platforms": [
@@ -5559,17 +5559,17 @@
},
"golang_1.18": {
"tools": {
- "golang_1.18": {
+ "golang": {
"bottle": "golang_1.18",
- "executable": "golang_1.18"
+ "executable": "golang"
},
- "go_1.18": {
+ "go": {
"bottle": "golang_1.18",
- "executable": "go_1.18"
+ "executable": "go"
},
- "gofmt_1.18": {
+ "gofmt": {
"bottle": "golang_1.18",
- "executable": "gofmt_1.18"
+ "executable": "gofmt"
}
},
"platforms": [
@@ -8253,11 +8253,11 @@
"match": "GOLANG"
},
"executable": {
- "go": [
+ "go_1.17": [
"bin",
"go"
],
- "gofmt": [
+ "gofmt_1.17": [
"bin",
"gofmt"
]
@@ -8274,11 +8274,11 @@
"match": "GOLANG"
},
"executable": {
- "go_1.18": [
+ "go": [
"bin",
"go"
],
- "gofmt_1.18": [
+ "gofmt": [
"bin",
"gofmt"
]
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index e3f99508ff4..491bb09cb24 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -8114,7 +8114,7 @@ elsewhen ($ARCH_ARM64) {
GO_HOST_TARG_PARAMS=++host-os $GO_HOST_OS ++host-arch $GO_HOST_ARCH ++targ-os $GO_TARG_OS ++targ-arch $GO_TARG_ARCH
# tag:go-specific
-GOSTD_VERSION=1.17.8
+GOSTD_VERSION=1.18.2
when ($GOSTD_VERSION == "1.17.8") {
GOSTD=contrib/go/_std/src
}