Skip to content

Commit 44e51dc

Browse files
authored
Merge pull request #9 from slr71/main
Dependency Updates
2 parents d3db726 + 6352725 commit 44e51dc

File tree

5 files changed

+107
-192
lines changed

5 files changed

+107
-192
lines changed
Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,13 @@
11
name: golangci-lint
22
on:
33
push:
4-
tags:
5-
- v*
64
branches:
75
- master
86
- main
97
pull_request:
10-
jobs:
11-
golangci:
12-
name: lint
13-
runs-on: ubuntu-latest
14-
steps:
15-
- uses: actions/checkout@v2
16-
- name: golangci-lint
17-
uses: golangci/golangci-lint-action@v2
18-
with:
19-
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
20-
version: latest
21-
22-
# Optional: working directory, useful for monorepos
23-
# working-directory: somedir
24-
25-
# Optional: golangci-lint command line arguments.
26-
# args: --issues-exit-code=0
27-
28-
# Optional: show only new issues if it's a pull request. The default value is `false`.
29-
# only-new-issues: true
308

31-
# Optional: if set to true then the action will use pre-installed Go.
32-
# skip-go-installation: true
33-
34-
# Optional: if set to true then the action don't cache or restore ~/go/pkg.
35-
# skip-pkg-cache: true
36-
37-
# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
38-
# skip-build-cache: true
9+
jobs:
10+
call-workflow-passing-data:
11+
uses: cyverse-de/github-workflows/.github/workflows/[email protected]
12+
with:
13+
go-version: 1.22

amqp_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"reflect"
99
"testing"
1010

11-
"github.com/cyverse-de/model/v6"
11+
"github.com/cyverse-de/model/v7"
1212
"github.com/streadway/amqp"
1313
)
1414

go.mod

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,35 @@
1-
module github.com/cyverse-de/messaging/v9
1+
module github.com/cyverse-de/messaging/v10
22

3-
go 1.16
3+
go 1.22
44

55
require (
6-
github.com/cyverse-de/model/v6 v6.0.1
7-
github.com/streadway/amqp v1.0.1-0.20200716223359-e6b33f460591
8-
go.opentelemetry.io/otel v1.6.0
9-
go.opentelemetry.io/otel/trace v1.6.0
6+
github.com/cyverse-de/model/v7 v7.0.0
7+
github.com/streadway/amqp v1.1.0
8+
go.opentelemetry.io/otel v1.26.0
9+
go.opentelemetry.io/otel/trace v1.26.0
10+
)
11+
12+
require (
13+
github.com/fsnotify/fsnotify v1.7.0 // indirect
14+
github.com/go-logr/logr v1.4.1 // indirect
15+
github.com/go-logr/stdr v1.2.2 // indirect
16+
github.com/hashicorp/hcl v1.0.0 // indirect
17+
github.com/magiconair/properties v1.8.7 // indirect
18+
github.com/mitchellh/mapstructure v1.5.0 // indirect
19+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
20+
github.com/sagikazarmark/locafero v0.4.0 // indirect
21+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
22+
github.com/sourcegraph/conc v0.3.0 // indirect
23+
github.com/spf13/afero v1.11.0 // indirect
24+
github.com/spf13/cast v1.6.0 // indirect
25+
github.com/spf13/pflag v1.0.5 // indirect
26+
github.com/spf13/viper v1.18.2 // indirect
27+
github.com/subosito/gotenv v1.6.0 // indirect
28+
go.opentelemetry.io/otel/metric v1.26.0 // indirect
29+
go.uber.org/multierr v1.11.0 // indirect
30+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
31+
golang.org/x/sys v0.20.0 // indirect
32+
golang.org/x/text v0.15.0 // indirect
33+
gopkg.in/ini.v1 v1.67.0 // indirect
34+
gopkg.in/yaml.v3 v3.0.1 // indirect
1035
)

0 commit comments

Comments
 (0)