From 6eef80df06c2e0d3b07d30984e105984e43e28be Mon Sep 17 00:00:00 2001 From: Tomas Volf Date: Wed, 26 Jan 2022 18:13:22 +0100 Subject: [PATCH] Update golang version Build tags changed between 1.16 and 1.17, so we need to have both versions for now. --- .github/workflows/go.yml | 8 ++++---- fqdn_posix.go | 1 + fqdn_test_posix.go | 1 + fqdn_test_win.go | 1 + fqdn_win.go | 1 + go.mod | 2 +- log.go | 1 + log_debug.go | 1 + util_posix.go | 1 + util_win.go | 1 + util_win_test.go | 1 + 11 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e7de74d..4b93e0e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -15,9 +15,9 @@ jobs: steps: - name: Set up Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v2 with: - go-version: '1.15' + go-version: '~1.17.0' - name: Checkout code uses: actions/checkout@v2 @@ -56,8 +56,8 @@ jobs: - ubuntu-latest - windows-latest go: - - '1.14' - - '1.15' + - '~1.16.0' + - '~1.17.0' steps: diff --git a/fqdn_posix.go b/fqdn_posix.go index 1266823..7967a42 100644 --- a/fqdn_posix.go +++ b/fqdn_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package fqdn diff --git a/fqdn_test_posix.go b/fqdn_test_posix.go index b365261..baa260d 100644 --- a/fqdn_test_posix.go +++ b/fqdn_test_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package fqdn diff --git a/fqdn_test_win.go b/fqdn_test_win.go index 6ac267b..bd73ce4 100644 --- a/fqdn_test_win.go +++ b/fqdn_test_win.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package fqdn diff --git a/fqdn_win.go b/fqdn_win.go index cd828ed..7173f18 100644 --- a/fqdn_win.go +++ b/fqdn_win.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package fqdn diff --git a/go.mod b/go.mod index 5327450..d6b6bec 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/Showmax/go-fqdn -go 1.15 +go 1.16 diff --git a/log.go b/log.go index 4d92241..ae2d769 100644 --- a/log.go +++ b/log.go @@ -1,3 +1,4 @@ +//go:build !DEBUG // +build !DEBUG package fqdn diff --git a/log_debug.go b/log_debug.go index 4c9dbab..a6b88da 100644 --- a/log_debug.go +++ b/log_debug.go @@ -1,3 +1,4 @@ +//go:build DEBUG // +build DEBUG package fqdn diff --git a/util_posix.go b/util_posix.go index d2ad4bb..b419520 100644 --- a/util_posix.go +++ b/util_posix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package fqdn diff --git a/util_win.go b/util_win.go index af82e3b..a960266 100644 --- a/util_win.go +++ b/util_win.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package fqdn diff --git a/util_win_test.go b/util_win_test.go index a1603e6..563bb44 100644 --- a/util_win_test.go +++ b/util_win_test.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package fqdn