Skip to content

Commit 1d09783

Browse files
authored
Merge pull request #950 from mrueg/go-1.17
Add support for go 1.17
2 parents 6d5cf25 + 8535b62 commit 1d09783

File tree

5 files changed

+8
-2
lines changed

5 files changed

+8
-2
lines changed

.circleci/config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ workflows:
6363
name: go-1-16
6464
go_version: "1.16"
6565
run_lint: true
66-
# Style and unused/missing packages are only checked against
67-
# the latest supported Go version.
66+
- test:
67+
name: go-1-17
68+
go_version: "1.17"
69+
run_lint: true
6870
run_style_and_unused: true

prometheus/collectors/dbstats_collector_go115.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14+
//go:build go1.15
1415
// +build go1.15
1516

1617
package collectors

prometheus/collectors/dbstats_collector_pre_go115.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14+
//go:build !go1.15
1415
// +build !go1.15
1516

1617
package collectors

prometheus/process_collector_other.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14+
//go:build !windows
1415
// +build !windows
1516

1617
package prometheus

prometheus/process_collector_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14+
//go:build linux
1415
// +build linux
1516

1617
package prometheus

0 commit comments

Comments
 (0)