diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-03-14 14:17:31 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-03-14 14:55:59 +0100 |
| commit | d23e90a7b44b62b0d3b116a6d30849ce66051529 (patch) | |
| tree | 1bdbc7c9d1d8e0b4f635a896147e26f1ad42b457 /pkg | |
| parent | 1e8208402d9c84d5f3ee6e33b63db8befbf61032 (diff) | |
all: switch to Go 1.12
Differences in code formatting between Go versions cause constant
problems for us (https://github.com/golang/go/issues/25161).
Currently we support 1.9 and 1.10. Switch to newer 1.11 and 1.12.
Fixes #1013
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/akaros.go | 4 | ||||
| -rw-r--r-- | pkg/build/fuchsia.go | 2 | ||||
| -rw-r--r-- | pkg/vcs/vcs_test.go | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkg/build/akaros.go b/pkg/build/akaros.go index 320616343..59f8347a5 100644 --- a/pkg/build/akaros.go +++ b/pkg/build/akaros.go @@ -86,8 +86,8 @@ bash return fmt.Errorf("failed to write image file: %v", err) } for src, dst := range map[string]string{ - ".config": "kernel.config", - "key": "key", + ".config": "kernel.config", + "key": "key", "obj/kern/akaros-kernel": "kernel", "obj/kern/akaros-kernel-64b": "obj/akaros-kernel-64b", } { diff --git a/pkg/build/fuchsia.go b/pkg/build/fuchsia.go index 491ce496c..f1ff225d7 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -31,7 +31,7 @@ func (fu fuchsia) build(targetArch, vmType, kernelDir, outputDir, compiler, user } for src, dst := range map[string]string{ "out/" + arch + "/obj/build/images/fvm.blk": "image", - ".ssh/pkey": "key", + ".ssh/pkey": "key", "out/build-zircon/kernel-" + arch + "-gcc/obj/kernel/zircon.elf": "obj/zircon.elf", "out/build-zircon/multiboot.bin": "kernel", "out/" + arch + "/fuchsia.zbi": "initrd", diff --git a/pkg/vcs/vcs_test.go b/pkg/vcs/vcs_test.go index 457430989..aa7210bf6 100644 --- a/pkg/vcs/vcs_test.go +++ b/pkg/vcs/vcs_test.go @@ -33,12 +33,12 @@ func TestCheckRepoAddress(t *testing.T) { "http://host.xz:123/path/to/repo.git/": true, "https://chromium.googlesource.com/chromiumos/third_party/kernel": true, "https://fuchsia.googlesource.com": true, - "": false, - "foobar": false, - "linux-next": false, - "foo://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": false, - "git://kernel/ubuntu.git": false, - "gitgit://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": false, + "": false, + "foobar": false, + "linux-next": false, + "foo://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": false, + "git://kernel/ubuntu.git": false, + "gitgit://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": false, }) } |