Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/docker/build-container/alpine-3.19
Browse files Browse the repository at this point in the history
  • Loading branch information
raphael-squelbut authored Jan 19, 2024
2 parents 3fcd4b1 + de03801 commit b57d992
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 448 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: ./go.mod
- run: go test -v -coverprofile=go-coverage.out -covermode=atomic -coverpkg=./... ./...
Expand All @@ -25,7 +25,7 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: ./js/.nvmrc
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Run tests + generate coverage report
working-directory: js
run: npm run test:coverage # stores the coverage report in ./coverage/lcov.info
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: mr-coverage-report
path: js/coverage/lcov.info
Expand All @@ -52,14 +52,14 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: ./go.mod
- run: make build
- uses: actions/setup-node@v4
with:
node-version-file: ./js/.nvmrc
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -84,7 +84,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: ./go.mod

Expand Down Expand Up @@ -148,10 +148,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
# - uses: actions/download-artifact@v3
# - uses: actions/download-artifact@v4
# with:
# name: go-coverage-report
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: mr-coverage-report
- run: cat lcov.info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
working-directory: js

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version-file: ./go.mod
id: go
Expand Down
26 changes: 13 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ require (
github.com/cosiner/flag v0.5.2
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
github.com/jaswdr/faker v1.19.1
github.com/minio/minio-go/v7 v7.0.64
github.com/minio/minio-go/v7 v7.0.66
github.com/minio/sio v0.3.1
github.com/ory/dockertest/v3 v3.10.0
github.com/pkg/errors v0.9.1
github.com/spf13/viper v1.17.0
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.8.4
github.com/tealeg/xlsx/v3 v3.3.4
golang.org/x/crypto v0.16.0
github.com/tealeg/xlsx/v3 v3.3.5
golang.org/x/crypto v0.18.0
golang.org/x/text v0.14.0
)

Expand All @@ -31,17 +31,17 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/frankban/quicktest v1.14.6 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
Expand All @@ -60,13 +60,13 @@ require (
github.com/rogpeppe/fastuuid v1.2.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rs/xid v1.5.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
Expand All @@ -76,8 +76,8 @@ require (
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/tools v0.15.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit b57d992

Please sign in to comment.