Skip to content

Commit

Permalink
Merge pull request cyverse-de#24 from slr71/main
Browse files Browse the repository at this point in the history
Dependency Updates
  • Loading branch information
slr71 authored May 11, 2024
2 parents 76c75ab + 2895725 commit 2a2f35e
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 200 deletions.
35 changes: 5 additions & 30 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,13 @@
name: golangci-lint
on:
push:
tags:
- v*
branches:
- master
- main
pull_request:
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: latest

# Optional: working directory, useful for monorepos
# working-directory: somedir

# Optional: golangci-lint command line arguments.
# args: --issues-exit-code=0

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

# Optional: if set to true then the action will use pre-installed Go.
# skip-go-installation: true

# Optional: if set to true then the action don't cache or restore ~/go/pkg.
# skip-pkg-cache: true

# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
# skip-build-cache: true
jobs:
call-workflow-passing-data:
uses: cyverse-de/github-workflows/.github/workflows/[email protected]
with:
go-version: 1.22
31 changes: 23 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
module github.com/cyverse-de/model/v6
module github.com/cyverse-de/model/v7

go 1.16
go 1.22

require (
github.com/cyverse-de/configurate v0.0.0-20190318152107-8f767cb828d9
github.com/magiconair/properties v1.8.1 // indirect
github.com/pelletier/go-toml v1.5.0 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.18.2
)

require (
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // 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/spf13/viper v1.4.0
golang.org/x/text v0.3.8 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 2a2f35e

Please sign in to comment.