From d568cbae382b2f36ff6c8f5e7c1a3341e0667a71 Mon Sep 17 00:00:00 2001 From: Ramazan A Date: Mon, 4 Apr 2022 10:13:56 +0300 Subject: [PATCH] go1.18 (#101) * go1.18 --- .github/workflows/ci.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/security_scan.yml | 2 +- cmd/capture/cloudbuild.yaml | 2 +- cmd/dlqcapture/cloudbuild.yaml | 2 +- cmd/server/cloudbuild.yaml | 2 +- cmd/sitemap/cloudbuild.yaml | 2 +- cmd/thumb/cloudbuild.yaml | 2 +- go.mod | 5 ++++- go.sum | 2 ++ schema.graphql | 1 + 11 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4377097..97964bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v1 with: - go-version: 1.17 + go-version: 1.18 - uses: actions/cache@v2 with: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 49118e7..8c73bbf 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-go@v1 with: - go-version: 1.17 + go-version: 1.18 - uses: actions/cache@v2 with: diff --git a/.github/workflows/security_scan.yml b/.github/workflows/security_scan.yml index 5877f86..a4432a9 100644 --- a/.github/workflows/security_scan.yml +++ b/.github/workflows/security_scan.yml @@ -4,7 +4,7 @@ name: "Security Scan" # The scheduled workflow runs every at 00:00 on Sunday UTC time. on: schedule: - - cron: '0 0 * * 0' + - cron: '0 0 1 * *' jobs: tests: diff --git a/cmd/capture/cloudbuild.yaml b/cmd/capture/cloudbuild.yaml index 4ac6e79..7f47394 100644 --- a/cmd/capture/cloudbuild.yaml +++ b/cmd/capture/cloudbuild.yaml @@ -1,5 +1,5 @@ steps: - - name: 'golang:1.17' + - name: 'golang:1.18' args: [ 'go', 'build', '-a', '-installsuffix','cgo', '-o' ,'tmp/app','.' ] env: - 'GO111MODULE=on' diff --git a/cmd/dlqcapture/cloudbuild.yaml b/cmd/dlqcapture/cloudbuild.yaml index a25af27..9408703 100644 --- a/cmd/dlqcapture/cloudbuild.yaml +++ b/cmd/dlqcapture/cloudbuild.yaml @@ -1,5 +1,5 @@ steps: - - name: 'golang:1.17' + - name: 'golang:1.18' args: [ 'go', 'build', '-a', '-installsuffix','cgo', '-o' ,'tmp/app','.' ] env: - 'GO111MODULE=on' diff --git a/cmd/server/cloudbuild.yaml b/cmd/server/cloudbuild.yaml index 2c1a75f..eff6d17 100644 --- a/cmd/server/cloudbuild.yaml +++ b/cmd/server/cloudbuild.yaml @@ -1,5 +1,5 @@ steps: - - name: 'golang:1.17' + - name: 'golang:1.18' args: [ 'go', 'build', '-a', '-installsuffix','cgo', '-o' ,'tmp/app','.' ] env: - 'GO111MODULE=on' diff --git a/cmd/sitemap/cloudbuild.yaml b/cmd/sitemap/cloudbuild.yaml index a68eb3f..a0ea66e 100644 --- a/cmd/sitemap/cloudbuild.yaml +++ b/cmd/sitemap/cloudbuild.yaml @@ -1,5 +1,5 @@ steps: - - name: 'golang:1.17' + - name: 'golang:1.18' args: [ 'go', 'build', '-a', '-installsuffix','cgo', '-o' ,'tmp/app','.' ] env: - 'GO111MODULE=on' diff --git a/cmd/thumb/cloudbuild.yaml b/cmd/thumb/cloudbuild.yaml index 6e2a93a..9cd856a 100644 --- a/cmd/thumb/cloudbuild.yaml +++ b/cmd/thumb/cloudbuild.yaml @@ -1,5 +1,5 @@ steps: - - name: 'golang:1.17' + - name: 'golang:1.18' args: [ 'go', 'build', '-a', '-installsuffix','cgo', '-o' ,'tmp/app','.' ] env: - 'GO111MODULE=on' diff --git a/go.mod b/go.mod index f7b7b2c..684f46c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module capturetweet.com -go 1.17 +go 1.18 require ( cloud.google.com/go v0.100.2 // indirect @@ -90,5 +90,8 @@ require ( cloud.google.com/go/compute v1.5.0 // indirect cloud.google.com/go/firestore v1.6.1 // indirect cloud.google.com/go/iam v0.3.0 // indirect + github.com/google/subcommands v1.0.1 // indirect github.com/magiconair/properties v1.8.5 // indirect + golang.org/x/mod v0.5.1 // indirect + golang.org/x/tools v0.1.9 // indirect ) diff --git a/go.sum b/go.sum index 3edc804..9dd19f2 100644 --- a/go.sum +++ b/go.sum @@ -618,6 +618,7 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -1158,6 +1159,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/schema.graphql b/schema.graphql index 34503c2..648c005 100644 --- a/schema.graphql +++ b/schema.graphql @@ -13,6 +13,7 @@ type Tweet { retweetCount:Int resources:[Resource] } + type Author { id:ID! userName:String!