Skip to content

Commit

Permalink
Merge pull request #8 from Shopify/version-update
Browse files Browse the repository at this point in the history
Update go dependency to 1.22; update yaml dep to avoid CVE
  • Loading branch information
sdufel authored Jul 24, 2024
2 parents f6632b6 + 690ebbb commit 63104f4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
deps:
strategy:
matrix:
version: ['1.18.0', '1.18.1']
version: ['1.22.0']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -27,7 +27,7 @@ jobs:
needs: ["deps"]
strategy:
matrix:
version: ['1.18.0', '1.18.1']
version: ['1.22.0']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -37,7 +37,7 @@ jobs:
go-version: ${{ matrix.version }}
- name: Main branch coverage
uses: actions/cache@v3
if: matrix.version == '1.18.1'
if: matrix.version == '1.22.0'
with:
path: |
main.lcov
Expand All @@ -48,14 +48,14 @@ jobs:
run: go test -v -coverprofile coverage.out -race ./...
- name: Bench
run: go test -v -run ^$ -bench . ./...
- uses: jandelgado/[email protected].5
if: matrix.version == '1.18.1'
- uses: jandelgado/[email protected].9
if: matrix.version == '1.22.0'
- name: Store main branch lcov
if: github.ref == 'refs/heads/main' && matrix.version == '1.18.1'
if: github.ref == 'refs/heads/main' && matrix.version == '1.22.0'
run: cp coverage.lcov main.lcov
- name: Code Coverage Report
uses: osmind-development-org/[email protected]
if: matrix.version == '1.18.1' && github.event_name == 'pull_request'
if: matrix.version == '1.22.0' && github.event_name == 'pull_request'
with:
lcov-file: ./coverage.lcov
lcov-base: ./main.lcov
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/Shopify/kitt

go 1.18
go 1.22

require github.com/stretchr/testify v1.7.1

require (
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
3 changes: 2 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 comments on commit 63104f4

Please sign in to comment.