Skip to content

Commit

Permalink
Merge branch 'release/2.04.1' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
edmc-ss committed Mar 1, 2024
2 parents 6599207 + 0296b49 commit e573485
Show file tree
Hide file tree
Showing 6 changed files with 257 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/run-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ cd /gopathroot/src/github.com/NVIDIA/proxyfs

go get github.com/mattn/goveralls

git config --global --add safe.directory .

make ci

# $COVERALLS_TOKEN must be configured in the CI/CD environment
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fetch-depth: 0
submodules: false
- name: Build, run unit tests, and get coverage
run: docker run -e "COVERALLS_TOKEN=${{ secrets.COVERALLS_TOKEN }}" -e "GIT_BRANCH=${{ github.ref }}" --cap-add SYS_ADMIN --device /dev/fuse -i -v `pwd`:/gopathroot/src/github.com/NVIDIA/proxyfs golang:1.17.2 /bin/bash -c "/gopathroot/src/github.com/NVIDIA/proxyfs/.github/workflows/run-unit-tests.sh"
run: docker run -e "GOFLAGS=-buildvcs=false" -e "COVERALLS_TOKEN=${{ secrets.COVERALLS_TOKEN }}" -e "GIT_BRANCH=${{ github.ref }}" --cap-add SYS_ADMIN --device /dev/fuse -i -v `pwd`:/gopathroot/src/github.com/NVIDIA/proxyfs golang:1.22 /bin/bash -c "/gopathroot/src/github.com/NVIDIA/proxyfs/.github/workflows/run-unit-tests.sh"
- name: Slack Notification
uses: rtCamp/action-slack-notify@v2
env:
Expand Down
31 changes: 28 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,40 @@ require (
github.com/NVIDIA/sortedmap v0.0.0-20221206223250-5aaf17459438
github.com/google/btree v1.0.1
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.1
golang.org/x/sys v0.13.0
github.com/stretchr/testify v1.7.5
golang.org/x/sys v0.17.0
)

require (
github.com/NVIDIA/cstruct v0.0.0-20221206222058-cbc877f192d5 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/ory/go-acc v0.2.8 // indirect
github.com/ory/viper v1.7.5 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit e573485

Please sign in to comment.