Skip to content

Commit

Permalink
Fix unix builds
Browse files Browse the repository at this point in the history
Note: this commit should not necessary as this has been
suitably fixed on the 'master' branch already.
However, the fixes are only available in 0.43.3 or later
and CockroachDB cannot upgrade to that version because of
cockroachdb/cockroach#67221 (comment)
and
bazel-contrib/rules_go#2479

So we're using this backport fix instead until that
other dependency management issue is resolved.
  • Loading branch information
knz committed Jul 6, 2021
1 parent 3ccc883 commit 883d340
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion internal/pkg/app/app_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build darwin linux
// +build !windows

package app

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/app/appname/appname_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build darwin linux
// +build !windows

package appname

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build darwin linux
// +build !windows

package filepathextended

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/interrupt/interrupt_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build darwin linux
// +build !windows

package interrupt

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/netrc/netrc_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build darwin linux
// +build !windows

package netrc

Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/netrc/netrc_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// +build darwin linux
// +build !windows

package netrc

Expand Down

0 comments on commit 883d340

Please sign in to comment.