Skip to content

Commit

Permalink
remove ts2019 build tag
Browse files Browse the repository at this point in the history 
Signed-off-by: Kristoffer Dalby <[email protected]>
  • Loading branch information
@kradalby
kradalby committed Nov 19, 2023
1 parent 741e5fe commit af1c2ad
Show file tree
Hide file tree
Showing 45 changed files with 10 additions and 56 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestACLAllowStarDst.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestACLAllowUser80Dst.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestACLAllowUserDst.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestACLDenyAllPort80.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestACLDevice1CanAccessDevice2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestACLHostsInNetMapTable.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestACLNamedHostsCanReach.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestACLNamedHostsCanReachBySubnet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestApiKeyCommand.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestAuthKeyLogoutAndRelogin.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestAuthWebFlowAuthenticationPingAll.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestAuthWebFlowLogoutAndRelogin.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestCreateTailscale.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestDERPServerScenario.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestEnablingRoutes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestEphemeral.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestExpireNode.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestHeadscale.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestNodeCommand.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestNodeExpireCommand.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestNodeMoveCommand.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestNodeRenameCommand.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestNodeTagCommand.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestOIDCAuthenticationPingAll.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestOIDCExpireNodesBasedOnTokenExpiry.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestPingAllByHostname.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestPingAllByIP.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestPreAuthKeyCommand.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestPreAuthKeyCommandReusableEphemeral.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestPreAuthKeyCommandWithoutExpiry.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestResolveMagicDNS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestSSHIsBlockedInACL.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestSSHMultipleUsersAllToAll.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestSSHNoSSHConfigured.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestSSHOneUserToAll.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestSSHUserOnlyIsolation.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestTaildrop.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestTailscaleNodesJoiningHeadcale.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-integration-v2-TestUserCommand.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ RUN go mod download

COPY . .

RUN CGO_ENABLED=0 GOOS=linux go install -tags ts2019 -ldflags="-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=$VERSION" -a ./cmd/headscale
RUN CGO_ENABLED=0 GOOS=linux go install -ldflags="-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=$VERSION" -a ./cmd/headscale
RUN strip /go/bin/headscale
RUN test -e /go/bin/headscale

# Production image
FROM docker.io/debian:bookworm-slim

RUN apt-get update \
&& apt-get install -y ca-certificates \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean
&& apt-get install -y ca-certificates \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean

COPY --from=build /go/bin/headscale /bin/headscale
ENV TZ UTC
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN go mod download

COPY . .

RUN CGO_ENABLED=0 GOOS=linux go install -tags ts2019 -ldflags="-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=$VERSION" -a ./cmd/headscale
RUN CGO_ENABLED=0 GOOS=linux go install -ldflags="-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=$VERSION" -a ./cmd/headscale
RUN test -e /go/bin/headscale

# Debug image
Expand All @@ -19,9 +19,9 @@ COPY --from=build /go/bin/headscale /bin/headscale
ENV TZ UTC

RUN apt-get update \
&& apt-get install --no-install-recommends --yes less jq \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean
&& apt-get install --no-install-recommends --yes less jq \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean
RUN mkdir -p /var/run/headscale

# Need to reset the entrypoint or everything will run as a busybox script
Expand Down
6 changes: 2 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ ifeq ($(filter $(GOOS), openbsd netbsd soloaris plan9), )
else
endif

TAGS = -tags ts2019

# GO_SOURCES = $(wildcard *.go)
# PROTO_SOURCES = $(wildcard **/*.proto)
GO_SOURCES = $(call rwildcard,,*.go)
Expand All @@ -24,7 +22,7 @@ build:
dev: lint test build

test:
gotestsum -- $(TAGS) -short -coverprofile=coverage.out ./...
gotestsum -- -short -coverprofile=coverage.out ./...

test_integration:
docker run \
Expand All @@ -34,7 +32,7 @@ test_integration:
-v $$PWD:$$PWD -w $$PWD/integration \
-v /var/run/docker.sock:/var/run/docker.sock \
golang:1 \
go run gotest.tools/gotestsum@latest -- $(TAGS) -failfast ./... -timeout 120m -parallel 8
go run gotest.tools/gotestsum@latest -- -failfast ./... -timeout 120m -parallel 8

lint:
golangci-lint run --fix --timeout 10m
Expand Down
1 change: 0 additions & 1 deletion cmd/gh-action-integration-generator/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
-tags ts2019 \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
Loading

0 comments on commit af1c2ad

Please sign in to comment.