update golang version

Signed-off-by: yzewei <[email protected]>
tonistiigi · Jan 19, 2024 · f157595 · f157595
1 parent d9087c2
commit f157595
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/test-go.bats b/src/test-go.bats
@@ -21,7 +21,7 @@ setup_file() {
 }
 
 teardown_file() {
-  for p in linux/amd64 linux/arm64 linux/ppc64le linux/s390x linux/386 linux/arm/v7 linux/arm/v6 linux/riscv64; do
+  for p in linux/amd64 linux/arm64 linux/ppc64le linux/s390x linux/386 linux/arm/v7 linux/arm/v6 linux/riscv64 linux/loong64; do
     TARGETPLATFORM=$p xxdel xx-c-essentials
     root=/$(TARGETPLATFORM=$p xx-info triple)
     if [ -d "$root" ] && [ "$root" != "/" ]; then
@@ -123,6 +123,9 @@ testEnv() {
 }
 
 @test "loong64-env" {
+  if ! supportLoongArchGo; then
+    skip "LoongArch64 GO not supported"
+  fi
   export TARGETARCH=loong64
   testEnv
 }
@@ -264,7 +267,7 @@ testHelloGO() {
 
 @test "loong64-hellogo" {
   if ! supportLoongArchGo; then
-    skip "LOONGARCH GO not supported"
+    skip "LoongGArch64 GO not supported"
   fi
   export TARGETARCH=loong64
   testHelloGO

diff --git a/src/test_helper.bash b/src/test_helper.bash
@@ -45,7 +45,7 @@ xxrun() {
         wasclang=1
       fi
       if [ "$p" = "golang" ]; then
-        p="golang-1.15"
+        p="golang-1.19"
         wasgolang=1
       fi
       set -- "$@" "$p"
@@ -63,7 +63,7 @@ xxrun() {
     fi
   fi
   if [ -n "$wasgolang" ] && ! command -v go 2>/dev/null >/dev/null; then
-    ln -s /usr/lib/go-1.15/bin/go /usr/bin/go
+    ln -s /usr/lib/go-1.19/bin/go /usr/bin/go
   fi
 }