Skip to content

Commit 7db1430

Browse files
committed
Merge remote-tracking branch 'origin/main' into james/oss-3364-bump-gcp-sdk
# Conflicts: # go.mod # go.sum
2 parents 29f49f1 + bf54c90 commit 7db1430

7 files changed

Lines changed: 46 additions & 223 deletions

File tree

.circleci/config.yml

Lines changed: 0 additions & 191 deletions
This file was deleted.

.github/workflows/pre-commit.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Pre-commit
2+
3+
on:
4+
push:
5+
6+
permissions:
7+
contents: read
8+
9+
jobs:
10+
pre-commit:
11+
name: Pre-commit
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
16+
17+
- name: Set up mise
18+
uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
22+
- name: Install pre-commit
23+
run: pip3 install pre-commit
24+
25+
- name: Install goimports
26+
run: go install golang.org/x/tools/cmd/goimports@latest
27+
28+
- name: Run pre-commit
29+
run: pre-commit run --all-files

go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/magiconair/properties v1.8.7
2121
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326
2222
github.com/miekg/dns v1.1.62
23-
github.com/mitchellh/go-homedir v1.1.0
23+
github.com/mitchellh/go-homedir v1.1.0 // indirect
2424
github.com/oracle/oci-go-sdk v7.1.0+incompatible
2525
github.com/pquerna/otp v1.4.0
2626
github.com/sirupsen/logrus v1.9.3
@@ -92,12 +92,12 @@ require (
9292
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.26
9393
github.com/aws/aws-sdk-go-v2/service/ssm v1.68.5
9494
github.com/aws/aws-sdk-go-v2/service/sts v1.42.0
95-
github.com/denisenkom/go-mssqldb v0.12.3
9695
github.com/gonvenience/ytbx v1.4.4
9796
github.com/hashicorp/go-getter/v2 v2.2.3
9897
github.com/homeport/dyff v1.6.0
9998
github.com/jackc/pgx/v5 v5.9.0
10099
github.com/lib/pq v1.10.9
100+
github.com/microsoft/go-mssqldb v1.9.8
101101
github.com/slack-go/slack v0.15.0
102102
google.golang.org/grpc v1.80.0
103103
gopkg.in/yaml.v3 v3.0.1
@@ -157,8 +157,8 @@ require (
157157
github.com/go-openapi/jsonpointer v0.21.0 // indirect
158158
github.com/go-openapi/jsonreference v0.20.2 // indirect
159159
github.com/go-openapi/swag v0.23.0 // indirect
160-
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
161-
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
160+
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
161+
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
162162
github.com/golang-sql/sqlexp v0.1.0 // indirect
163163
github.com/gonvenience/bunt v1.3.5 // indirect
164164
github.com/gonvenience/neat v1.3.12 // indirect
@@ -201,6 +201,7 @@ require (
201201
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
202202
github.com/russross/blackfriday/v2 v2.1.0 // indirect
203203
github.com/sergi/go-diff v1.3.1 // indirect
204+
github.com/shopspring/decimal v1.4.0 // indirect
204205
github.com/spf13/pflag v1.0.9 // indirect
205206
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
206207
github.com/texttheater/golang-levenshtein v1.0.1 // indirect

0 commit comments

Comments
 (0)