From 53e2c1f7cd28749b79fb5d4ccee5b6c55becc1d1 Mon Sep 17 00:00:00 2001 From: hellodword <46193371+hellodword@users.noreply.github.com> Date: Mon, 12 Sep 2022 22:36:23 +0800 Subject: [PATCH 1/4] disable notify in forked repository --- .github/workflows/build.yml | 3 ++- .github/workflows/lint.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61ed05e2..7e153d0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,7 +112,8 @@ # Use always() to signal to the runner that this job must run even if the # previous ones failed. 'if': - ${{ always() && + ${{ github.repository_owner == 'AdguardTeam' && + always() && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1842c2dc..56183571 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -43,7 +43,8 @@ # Use always() to signal to the runner that this job must run even if the # previous ones failed. 'if': - ${{ always() && + ${{ github.repository_owner == 'AdguardTeam' && + always() && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository From bedfb47a9f21f225296806de0b452b9ad5262d43 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Tue, 13 Sep 2022 13:49:58 +0300 Subject: [PATCH 2/4] all: fmt workflow specs --- .github/workflows/build.yml | 3 ++- .github/workflows/lint.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e153d0d..c01f5b2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,8 +112,9 @@ # Use always() to signal to the runner that this job must run even if the # previous ones failed. 'if': - ${{ github.repository_owner == 'AdguardTeam' && + ${{ always() && + github.repository_owner == 'AdguardTeam' && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 56183571..a60121fe 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -43,8 +43,9 @@ # Use always() to signal to the runner that this job must run even if the # previous ones failed. 'if': - ${{ github.repository_owner == 'AdguardTeam' && + ${{ always() && + github.repository_owner == 'AdguardTeam' && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository From 08799e9d0a335046f315977aefc4e468b60fddc0 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Tue, 13 Sep 2022 14:00:46 +0300 Subject: [PATCH 3/4] all: use precise go version in github workflows --- .github/workflows/build.yml | 6 +++--- .github/workflows/lint.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c01f5b2c..dbe2bad3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ 'name': 'build' 'env': - 'GO_VERSION': '1.18' + 'GO_VERSION': '1.18.6' 'NODE_VERSION': '14' 'on': @@ -31,7 +31,7 @@ 'with': 'fetch-depth': 0 - 'name': 'Set up Go' - 'uses': 'actions/setup-go@v2' + 'uses': 'actions/setup-go@v3' 'with': 'go-version': '${{ env.GO_VERSION }}' - 'name': 'Set up Node' @@ -72,7 +72,7 @@ 'with': 'fetch-depth': 0 - 'name': 'Set up Go' - 'uses': 'actions/setup-go@v2' + 'uses': 'actions/setup-go@v3' 'with': 'go-version': '${{ env.GO_VERSION }}' - 'name': 'Set up Node' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a60121fe..64719a3e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ 'name': 'lint' 'env': - 'GO_VERSION': '1.18' + 'GO_VERSION': '1.18.6' 'on': 'push': @@ -17,7 +17,7 @@ 'steps': - 'uses': 'actions/checkout@v2' - 'name': 'Set up Go' - 'uses': 'actions/setup-go@v2' + 'uses': 'actions/setup-go@v3' 'with': 'go-version': '${{ env.GO_VERSION }}' - 'name': 'run-lint' From b79c08316f37ddfec94c73ee9c02405059fcd52f Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Tue, 13 Sep 2022 14:39:10 +0300 Subject: [PATCH 4/4] all: temp disable govulncheck --- internal/tools/go.mod | 6 +++--- internal/tools/go.sum | 12 ++++++------ scripts/make/go-lint.sh | 5 ++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index ed3ed977..c4f78914 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -10,7 +10,7 @@ require ( github.com/kyoh86/looppointer v0.1.7 github.com/securego/gosec/v2 v2.13.1 golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 - golang.org/x/vuln v0.0.0-20220902211423-27dd78d2ca39 + golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 honnef.co/go/tools v0.3.3 mvdan.cc/gofumpt v0.3.1 mvdan.cc/unparam v0.0.0-20220831102321-2fc90a84c7ec @@ -25,10 +25,10 @@ require ( github.com/kyoh86/nolint v0.0.1 // indirect github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect - golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect + golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect - golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 // indirect + golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 0f43bb9f..367d3d53 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -55,8 +55,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw= -golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E= +golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk= golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -86,8 +86,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 h1:C1tElbkWrsSkn3IRl1GCW/gETw1TywWIPgwZtXTZbYg= -golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho= +golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -102,8 +102,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY= golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/vuln v0.0.0-20220902211423-27dd78d2ca39 h1:501+NfNjDh4IT4HOzdeezTOFD7njtY49aXJN1oY3E1s= -golang.org/x/vuln v0.0.0-20220902211423-27dd78d2ca39/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= +golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM= +golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh index 2cdcc90d..f6f09592 100644 --- a/scripts/make/go-lint.sh +++ b/scripts/make/go-lint.sh @@ -219,7 +219,10 @@ exit_on_output gofumpt --extra -e -l . "$GO" vet ./... -govulncheck ./... +# TODO(a.garipov): Reenable this once https://github.com/golang/go/issues/55035 +# is fixed. +# +# govulncheck ./... # Apply more lax standards to the code we haven't properly refactored yet. gocyclo --over 17 ./internal/querylog/