From 4a6501c094f4437abb0a6c9485f711e158f45209 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 9 Sep 2021 00:36:47 -0400 Subject: [PATCH 1/3] build: bump to go 1.17 --- .github/workflows/build.yaml | 10 ++++------ .github/workflows/release.yml | 28 +++++++++++----------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d0d0e47bd..740056508 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,13 +23,11 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Check out code - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: Set up Go - uses: actions/setup-go@v2 + - uses: actions/setup-go@v2 with: - go-version: 1.15 + go-version: 1.17 - name: Test run: go test ./... @@ -37,4 +35,4 @@ jobs: - name: Build run: go build . - working-directory: v2/cmd/subfinder/ \ No newline at end of file + working-directory: v2/cmd/subfinder/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 822994122..547b6f251 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,27 +4,21 @@ on: tags: - v* -jobs: - release: +jobs: + release: runs-on: ubuntu-latest - steps: - - - name: "Check out code" - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: "Set up Go" - uses: actions/setup-go@v2 - with: - go-version: 1.15 - - - env: + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-go@v2 + with: + go-version: 1.17 + - + env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" name: "Create release on GitHub" uses: goreleaser/goreleaser-action@v2 - with: + with: args: "release --rm-dist" version: latest workdir: v2/ - \ No newline at end of file From b824e3b5710c2ddefaa747716ca8095891e22ed5 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 9 Sep 2021 00:37:36 -0400 Subject: [PATCH 2/3] build: update dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e8ba955c1..7270f703d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # Build -FROM golang:1.16.7-alpine AS build-env +FROM golang:1.17-alpine AS build-env RUN GO111MODULE=on go get -v github.com/projectdiscovery/subfinder/v2/cmd/subfinder # Release -FROM alpine:latest +FROM alpine:3.14 RUN apk -U upgrade --no-cache \ && apk add --no-cache bind-tools ca-certificates COPY --from=build-env /go/bin/subfinder /usr/local/bin/subfinder From 8c05a944df127001d0bdba99deafff3eb7fe1f29 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 9 Sep 2021 00:38:22 -0400 Subject: [PATCH 3/3] build: update go.mod and pull in indirect dependencies --- v2/go.mod | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/v2/go.mod b/v2/go.mod index 543cf9ed9..67f204b4c 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -1,6 +1,6 @@ module github.com/projectdiscovery/subfinder/v2 -go 1.16 +go 1.17 require ( github.com/hako/durafmt v0.0.0-20210316092057-3a2c319c1acd @@ -15,3 +15,16 @@ require ( github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/logrusorgru/aurora v2.0.3+incompatible // indirect + github.com/miekg/dns v1.1.41 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/projectdiscovery/retryabledns v1.0.12-0.20210419174848-eec3ac17d61e // indirect + golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d // indirect + golang.org/x/sys v0.0.0-20210419170143-37df388d1f33 // indirect +)