Skip to content

Commit

Permalink
updating to go 1.21, upgrading dependencies (#81)
Browse files Browse the repository at this point in the history
* updating to go 1.21, also upgrading versions in blubber and upgrading dependencies
* explicitly specifying the toolchain breaks codeQL, so left that commented out
* Semgrep is no longer availble for unattended workflows as it used to be, that is now not part of the workflow any longer. Issue created for considering an alternative #82
* also temporarily replacing the vulnerable git-urls package with a version which has the vulnerability fixed see #83

---------

Co-authored-by: Michael Cochez <miselico@users.noreply.github.com>
  • Loading branch information
miselico and miselico authored Jan 21, 2024
1 parent bb3b125 commit 89c07ce
Show file tree
Hide file tree
Showing 10 changed files with 91 additions and 146 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/golang-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: "1.20"
go-version: "1.21"
cache: false
- uses: actions/checkout@v3
- name: golangci-lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gotest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ["1.20"]
go: ["1.21"]
name: Go ${{ matrix.go }} sample
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nancy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Go 1.x in order to write go.list file
uses: actions/setup-go@v4
with:
go-version: ^1.20
go-version: ^1.21
- name: WriteGoList
run: go list -json -m all > go.list

Expand Down
56 changes: 0 additions & 56 deletions .github/workflows/semgrep.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .pipeline/blubber.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lives:

variants:
build:
base: docker-registry.wikimedia.org/golang1.19:latest
base: docker-registry.wikimedia.org/golang1.21:latest
builder:
command: [ ./blubber-prepare.sh ]
requirements: [ . ]
Expand Down
2 changes: 1 addition & 1 deletion blubber-entrypoint-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo "Starting RecommenderServer..."

DIR=`pwd`

export GOROOT=/usr/lib/go-1.19
export GOROOT=/usr/lib/go-1.21
export PATH=${GOROOT}/bin:${PATH}
# export GOPATH=/srv/goProjects
# export PATH=${GOPATH}/bin:${PATH}
Expand Down
2 changes: 1 addition & 1 deletion blubber-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo "Starting RecommenderServer..."

DIR=`pwd`

export GOROOT=/usr/lib/go-1.19
export GOROOT=/usr/lib/go-1.21
export PATH=${GOROOT}/bin:${PATH}
# export GOPATH=/srv/goProjects
# export PATH=${GOPATH}/bin:${PATH}
Expand Down
2 changes: 1 addition & 1 deletion blubber-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build_recommenderserver() {
fi
}

export GOROOT=/usr/lib/go-1.19
export GOROOT=/usr/lib/go-1.21
export PATH=${GOROOT}/bin:${PATH}
# export GOPATH=/srv/goProjects
# export PATH=${GOPATH}/bin:${PATH}
Expand Down
44 changes: 23 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,65 +1,67 @@
module RecommenderServer

go 1.20
go 1.21

// toolchain go1.21.6

require (
github.com/google/uuid v1.3.1
github.com/google/uuid v1.5.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.7.0
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.8.4
gitlab.com/tozd/go/errors v0.8.0
gitlab.com/tozd/go/errors v0.8.1
gitlab.com/tozd/go/mediawiki v0.14.0
google.golang.org/protobuf v1.31.0
google.golang.org/protobuf v1.32.0
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/PuerkitoBio/goquery v1.8.1 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cosnicolaou/pbzip2 v1.0.3 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/elliotchance/phpserialize v1.3.3 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/foolin/pagser v0.1.5 // indirect
github.com/foolin/pagser v0.1.6 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.9.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.17.1 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/microcosm-cc/bluemonday v1.0.24 // indirect
github.com/pingcap/errors v0.11.5-0.20210425183316-da1aaba5fb63 // indirect
github.com/pingcap/log v1.1.0 // indirect
github.com/pingcap/parser v0.0.0-20210802034743-dd9b189324ce // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/whilp/git-urls v1.0.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
gitlab.com/tozd/go/x v0.0.0-20231005202212-8fab71759a8f // indirect
gitlab.com/tozd/go/x v0.0.0-20231203095540-41b15b78555f // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.17.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/whilp/git-urls v1.0.0 => github.com/chainguard-dev/git-urls v1.0.2
Loading

0 comments on commit 89c07ce

Please sign in to comment.