Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Update Go to 1.21
Update npm deps
Update Go deps
Update GitHub actions
  • Loading branch information
conradhodge committed Jan 7, 2024
1 parent 2b4700e commit c168ff1
Show file tree
Hide file tree
Showing 8 changed files with 1,435 additions and 1,219 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
id: node

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: "^1.20.0"
go-version: "1.21"

- name: Check out code
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
id: node

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: "^1.16.4"
go-version: "1.21"

- name: Check out code
uses: actions/checkout@v2
Expand Down
41 changes: 30 additions & 11 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,56 @@
name: golangci-lint

on:
push:
branches: [main]
branches:
- main
pull_request:
branches: [main]
branches:
- main

permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read

jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: "1.21"
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
# Require: The version of golangci-lint to use.
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
version: latest

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

# Optional: golangci-lint command line arguments.
# args: --issues-exit-code=0
#
# Note: By default, the `.golangci.yml` file should be at the root of the repository.
# The location of the configuration file can be changed by using `--config=`
# args: --timeout=30m --config=/my/path/.golangci.yml --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 all caching functionality will be completely disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true then the action don't cache or restore ~/go/pkg.
# Optional: if set to true, then the action won'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.
# Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
# skip-build-cache: true

# Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
# install-mode: "goinstall"
8 changes: 0 additions & 8 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ output:

# all available settings of specific linters
linters-settings:
depguard:
list-type: blacklist
include-go-root: false

dupl:
# tokens count to trigger issue, 150 by default
threshold: 100
Expand Down Expand Up @@ -107,8 +103,6 @@ linters:
disable-all: true
enable:
- bodyclose
- deadcode
- depguard
- dupl
- errcheck
- gocognit
Expand All @@ -122,8 +116,6 @@ linters:
- prealloc
- revive
- staticcheck
- structcheck
- typecheck
- unused
- varcheck
- whitespace
45 changes: 24 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,42 +1,45 @@
module github.com/conradhodge/next-tram

go 1.20
go 1.21

require (
github.com/arienmalec/alexa-go v0.0.0-20181025212142-975687393e90
github.com/aws/aws-cdk-go/awscdk v1.202.0-devpreview
github.com/aws/aws-cdk-go/awscdk/v2 v2.80.0
github.com/aws/aws-lambda-go v1.41.0
github.com/aws/constructs-go/constructs/v10 v10.2.31
github.com/aws/constructs-go/constructs/v3 v3.4.305
github.com/aws/jsii-runtime-go v1.81.0
github.com/conradhodge/travel-api-client v0.2.6
github.com/aws/aws-cdk-go/awscdk v1.204.0-devpreview
github.com/aws/aws-cdk-go/awscdk/v2 v2.118.0
github.com/aws/aws-lambda-go v1.43.0
github.com/aws/constructs-go/constructs/v10 v10.3.0
github.com/aws/constructs-go/constructs/v3 v3.4.344
github.com/aws/jsii-runtime-go v1.93.0
github.com/conradhodge/travel-api-client v0.2.7
github.com/golang/mock v1.6.0
github.com/stretchr/testify v1.8.3
github.com/tidwall/gjson v1.14.4
github.com/stretchr/testify v1.8.4
github.com/tidwall/gjson v1.17.0
)

require (
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/cdklabs/awscdk-asset-awscli-go/awscliv1/v2 v2.2.183 // indirect
github.com/cdklabs/awscdk-asset-kubectl-go/kubectlv20/v2 v2.1.1 // indirect
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv5/v2 v2.0.153 // indirect
github.com/cdklabs/awscdk-asset-awscli-go/awscliv1/v2 v2.2.201 // indirect
github.com/cdklabs/awscdk-asset-kubectl-go/kubectlv20/v2 v2.1.2 // indirect
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv5/v2 v2.0.166 // indirect
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv6/v2 v2.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/stretchr/objx v0.5.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/yuin/goldmark v1.5.4 // indirect
github.com/yuin/goldmark v1.6.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/tools v0.9.1 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/tools v0.16.1 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit c168ff1

Please sign in to comment.