Skip to content

Commit

Permalink
Revert ".github/workflows: work around golang/go#51629"
Browse files Browse the repository at this point in the history
This reverts commit 2a412ac.

Updates #4194

Change-Id: I0098b66b71d20bea301ca79058c1cdd201237dd0
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
  • Loading branch information
bradfitz committed Apr 13, 2022
1 parent 86da51f commit bf880c3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 34 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/go-generate-without-stringer.sh

This file was deleted.

13 changes: 7 additions & 6 deletions .github/workflows/go_generate.yml
Expand Up @@ -25,13 +25,14 @@ jobs:
fetch-depth: 0

- name: check 'go generate' is clean
# The shell script invocation below is a temporary hack for
# https://github.com/tailscale/tailscale/issues/4194. When
# that issue is fixed, replace its invocation with:
# go generate --tags=hermetic ./...
run: |
set -e
./.github/workflows/go-generate-without-stringer.sh
if [[ "${{github.ref}}" == release-branch/* ]]
then
pkgs=$(go list ./... | grep -v dnsfallback)
else
pkgs=$(go list ./... | grep -v dnsfallback)
fi
go generate $pkgs
echo
echo
git diff --name-only --exit-code || (echo "The files above need updating. Please run 'go generate'."; exit 1)
2 changes: 2 additions & 0 deletions net/dnsfallback/dnsfallback.go
Expand Up @@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:generate go run update-dns-fallbacks.go

// Package dnsfallback contains a DNS fallback mechanism
// for starting up Tailscale when the system DNS is broken or otherwise unavailable.
package dnsfallback
Expand Down
10 changes: 0 additions & 10 deletions net/dnsfallback/generate.go

This file was deleted.

0 comments on commit bf880c3

Please sign in to comment.