From 978ada641f921deae4c0e3c085417438a5acb08b Mon Sep 17 00:00:00 2001 From: thinkerou Date: Tue, 5 Jan 2021 09:59:03 +0800 Subject: [PATCH 1/3] Revert "Adding ppc64le architecture support on travis-ci (#2538)" This reverts commit fca3f95d7cdfdef203c78f220b84118f44590512. --- .travis.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91129313f1..0795665dc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,34 +18,6 @@ matrix: env: - TESTTAGS=nomsgpack - go: master - # Adding ppc64le jobs - - go: 1.11.x - arch: ppc64le - env: GO111MODULE=on - - go: 1.12.x - arch: ppc64le - env: GO111MODULE=on - - go: 1.13.x - arch: ppc64le - - go: 1.13.x - arch: ppc64le - env: - - TESTTAGS=nomsgpack - - go: 1.14.x - arch: ppc64le - - go: 1.14.x - arch: ppc64le - env: - - TESTTAGS=nomsgpack - - go: 1.15.x - arch: ppc64le - - go: 1.15.x - arch: ppc64le - env: - - TESTTAGS=nomsgpack - - go: master - arch: ppc64le - git: depth: 10 From d485f682466b501cb5a003db0efdf6eb19ca5efe Mon Sep 17 00:00:00 2001 From: thinkerou Date: Sat, 27 Mar 2021 08:38:37 +0800 Subject: [PATCH 2/3] build: convert to go:build directives --- binding/binding.go | 1 + binding/binding_msgpack_test.go | 1 + binding/binding_nomsgpack.go | 1 + binding/msgpack.go | 1 + binding/msgpack_test.go | 1 + context_appengine.go | 5 +++-- errors_1.13_test.go | 1 + internal/json/json.go | 1 + internal/json/jsoniter.go | 1 + render/msgpack.go | 1 + render/render_msgpack_test.go | 1 + 11 files changed, 13 insertions(+), 2 deletions(-) diff --git a/binding/binding.go b/binding/binding.go index 5c8e235b5f..7b2f24fa74 100644 --- a/binding/binding.go +++ b/binding/binding.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build !nomsgpack +//go:build !nomsgpack package binding diff --git a/binding/binding_msgpack_test.go b/binding/binding_msgpack_test.go index 9791a60763..3af11476d0 100644 --- a/binding/binding_msgpack_test.go +++ b/binding/binding_msgpack_test.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build !nomsgpack +//go:build !nomsgpack package binding diff --git a/binding/binding_nomsgpack.go b/binding/binding_nomsgpack.go index fd227b11a8..e1dcc508b4 100644 --- a/binding/binding_nomsgpack.go +++ b/binding/binding_nomsgpack.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build nomsgpack +//go:build nomsgpack package binding diff --git a/binding/msgpack.go b/binding/msgpack.go index a5bc2ad297..e9866a2046 100644 --- a/binding/msgpack.go +++ b/binding/msgpack.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build !nomsgpack +//go:build !nomsgpack package binding diff --git a/binding/msgpack_test.go b/binding/msgpack_test.go index 296d3eb18c..f6fab4cf7e 100644 --- a/binding/msgpack_test.go +++ b/binding/msgpack_test.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build !nomsgpack +//go:build !nomsgpack package binding diff --git a/context_appengine.go b/context_appengine.go index 38c189a0b8..258e4faf7b 100644 --- a/context_appengine.go +++ b/context_appengine.go @@ -1,9 +1,10 @@ -// +build appengine - // Copyright 2017 Manu Martinez-Almeida. All rights reserved. // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. +// +build appengine +//go:build appengine + package gin func init() { diff --git a/errors_1.13_test.go b/errors_1.13_test.go index a8f9a94e10..38f16be6be 100644 --- a/errors_1.13_test.go +++ b/errors_1.13_test.go @@ -1,4 +1,5 @@ // +build go1.13 +//go:build go1.13 package gin diff --git a/internal/json/json.go b/internal/json/json.go index 480e8bff48..03b3d068e5 100644 --- a/internal/json/json.go +++ b/internal/json/json.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build !jsoniter +//go:build !jsoniter package json diff --git a/internal/json/jsoniter.go b/internal/json/jsoniter.go index 649a3cdb6a..ab4c3831eb 100644 --- a/internal/json/jsoniter.go +++ b/internal/json/jsoniter.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build jsoniter +//go:build jsoniter package json diff --git a/render/msgpack.go b/render/msgpack.go index be2d45c51c..9a4f789491 100644 --- a/render/msgpack.go +++ b/render/msgpack.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build !nomsgpack +//go:build !nomsgpack package render diff --git a/render/render_msgpack_test.go b/render/render_msgpack_test.go index e439ac48ed..22c6353555 100644 --- a/render/render_msgpack_test.go +++ b/render/render_msgpack_test.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // +build !nomsgpack +//go:build !nomsgpack package render From 54287110661bb5bc4a50a186c00c9624570f5620 Mon Sep 17 00:00:00 2001 From: thinkerou Date: Sat, 27 Mar 2021 08:51:23 +0800 Subject: [PATCH 3/3] updata build sort --- binding/binding.go | 2 +- binding/binding_msgpack_test.go | 2 +- binding/binding_nomsgpack.go | 2 +- binding/msgpack.go | 2 +- binding/msgpack_test.go | 2 +- context_appengine.go | 2 +- errors_1.13_test.go | 2 +- internal/json/json.go | 2 +- internal/json/jsoniter.go | 2 +- render/msgpack.go | 2 +- render/render_msgpack_test.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/binding/binding.go b/binding/binding.go index 7b2f24fa74..5caeb581af 100644 --- a/binding/binding.go +++ b/binding/binding.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build !nomsgpack //go:build !nomsgpack +// +build !nomsgpack package binding diff --git a/binding/binding_msgpack_test.go b/binding/binding_msgpack_test.go index 3af11476d0..04d9407971 100644 --- a/binding/binding_msgpack_test.go +++ b/binding/binding_msgpack_test.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build !nomsgpack //go:build !nomsgpack +// +build !nomsgpack package binding diff --git a/binding/binding_nomsgpack.go b/binding/binding_nomsgpack.go index e1dcc508b4..9afa3dcf6d 100644 --- a/binding/binding_nomsgpack.go +++ b/binding/binding_nomsgpack.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build nomsgpack //go:build nomsgpack +// +build nomsgpack package binding diff --git a/binding/msgpack.go b/binding/msgpack.go index e9866a2046..2a442996a6 100644 --- a/binding/msgpack.go +++ b/binding/msgpack.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build !nomsgpack //go:build !nomsgpack +// +build !nomsgpack package binding diff --git a/binding/msgpack_test.go b/binding/msgpack_test.go index f6fab4cf7e..75600ba830 100644 --- a/binding/msgpack_test.go +++ b/binding/msgpack_test.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build !nomsgpack //go:build !nomsgpack +// +build !nomsgpack package binding diff --git a/context_appengine.go b/context_appengine.go index 258e4faf7b..d565843489 100644 --- a/context_appengine.go +++ b/context_appengine.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build appengine //go:build appengine +// +build appengine package gin diff --git a/errors_1.13_test.go b/errors_1.13_test.go index 38f16be6be..5fb6057baa 100644 --- a/errors_1.13_test.go +++ b/errors_1.13_test.go @@ -1,5 +1,5 @@ -// +build go1.13 //go:build go1.13 +// +build go1.13 package gin diff --git a/internal/json/json.go b/internal/json/json.go index 03b3d068e5..172aeb2414 100644 --- a/internal/json/json.go +++ b/internal/json/json.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build !jsoniter //go:build !jsoniter +// +build !jsoniter package json diff --git a/internal/json/jsoniter.go b/internal/json/jsoniter.go index ab4c3831eb..232f8dcada 100644 --- a/internal/json/jsoniter.go +++ b/internal/json/jsoniter.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build jsoniter //go:build jsoniter +// +build jsoniter package json diff --git a/render/msgpack.go b/render/msgpack.go index 9a4f789491..6ef5b6e514 100644 --- a/render/msgpack.go +++ b/render/msgpack.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build !nomsgpack //go:build !nomsgpack +// +build !nomsgpack package render diff --git a/render/render_msgpack_test.go b/render/render_msgpack_test.go index 22c6353555..8170fbe815 100644 --- a/render/render_msgpack_test.go +++ b/render/render_msgpack_test.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a MIT style // license that can be found in the LICENSE file. -// +build !nomsgpack //go:build !nomsgpack +// +build !nomsgpack package render