Merge branch 'main' into github-actions

Author: rosygmiki

.github/workflows/ci.yml

@@ -11,8 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Successful test
-        run: echo "The job was automatically triggered by a ${{ github.push }} event."
-  
+        run: echo "The job was automatically triggered by a ${{ github.event_name }} event."
   test-makefile:
     name: build and test makefile
     runs-on: ubuntu-latest

Makefile

@@ -9,7 +9,7 @@ endif
 
 BUILDFLAGS :=
 
-PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...)
+PACKAGES := $(shell go list $(BUILDFLAGS) ./...)
 SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)
 
 PREFIX ?= ${DESTDIR}/usr
@@ -20,13 +20,13 @@ export PATH := $(PATH):${GOBIN}
 all: tools tar-diff tar-patch test validate .gitvalidation
 
 build:
-	GO111MODULE="on" go build $(BUILDFLAGS) ./...
+	go build $(BUILDFLAGS) ./...
 
 tar-diff:
-	GO111MODULE="on" go build $(BUILDFLAGS) ./cmd/tar-diff
+	go build $(BUILDFLAGS) ./cmd/tar-diff
 
 tar-patch:
-	GO111MODULE="on" go build $(BUILDFLAGS) ./cmd/tar-patch
+	go build $(BUILDFLAGS) ./cmd/tar-patch
 
 install: tar-diff tar-patch
 	install -d -m 755 ${INSTALLDIR}
@@ -37,12 +37,12 @@ tools: .install.gitvalidation .install.golangci-lint
 
 .install.gitvalidation:
 	if [ ! -x "$(GOBIN)/git-validation" ]; then \
-		GO111MODULE="off" go get $(BUILDFLAGS) github.com/vbatts/git-validation; \
+		go install github.com/vbatts/git-validation@latest; \
 	fi
 
 .install.golangci-lint:
 	if [ ! -x "$(GOBIN)/golangci-lint" ]; then \
-		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOBIN) v1.25.0; \
+		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOBIN) latest; \
 	fi
 
 clean:
@@ -52,23 +52,23 @@ integration-test: tar-diff tar-patch
 	tests/test.sh
 
 unit-test:
-	GO111MODULE="on" go test $(BUILDFLAGS) -cover ./...
+	go test $(BUILDFLAGS) -cover ./...
 
 test: unit-test integration-test
 
 fmt:
 	@gofmt -l -s -w $(SOURCE_DIRS)
 
 validate: lint
-	@GO111MODULE="on" go vet ./...
+	@go vet ./...
 	@test -z "$$(gofmt -s -l . | tee /dev/stderr)"
 
 lint:
 	$(GOBIN)/golangci-lint run
 
 .gitvalidation:
 	@which $(GOBIN)/git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make clean && make tools'" && false)
-ifeq ($(TRAVIS),true)
+ifeq ($(GITHUB_ACTIONS),true)
 	$(GOBIN)/git-validation -q -run DCO,short-subject,dangling-whitespace
 else
 	git fetch -q "https://github.com/containers/tar-diff.git" "refs/heads/master"