Skip to content

Commit

Permalink
Merge pull request #238 from mergestat/add-mac-os-tests
Browse files Browse the repository at this point in the history
Add MacOS environment to CI and bump to Go `1.17`
  • Loading branch information
patrickdevivo authored Jan 22, 2022
2 parents 403581b + e303c58 commit c4ee37e
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
asset_name: mergestat-macos-amd64

steps:
- name: Set up Go 1.15
- name: Set up Go 1.17
uses: actions/setup-go@v1
with:
go-version: 1.15.5
go-version: 1.17.5
id: go

- name: Check out source
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,21 @@ name: Tests
on: [push, pull_request]
jobs:
build:
name: Build
runs-on: ubuntu-latest
name: Build for ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: ubuntu-latest
asset_name: mergestat-linux-amd64
- os: macos-latest
asset_name: mergestat-macos-amd64

steps:
- name: Set up Go 1.15
- name: Set up Go 1.17
uses: actions/setup-go@v1
with:
go-version: 1.15.5
go-version: 1.17.5
id: go

- name: Check out source
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.15-buster as builder
FROM golang:1.17-buster as builder
WORKDIR /app
COPY scripts .
RUN apt-get update && apt-get -y install cmake libssl-dev
Expand Down
57 changes: 42 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,46 +1,73 @@
module github.com/mergestat/mergestat

go 1.13
go 1.17

require (
github.com/BurntSushi/toml v1.0.0
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/augmentable-dev/vtab v0.0.0-20210915151038-6572bfc4e313
github.com/charmbracelet/lipgloss v0.4.0
github.com/clbanning/mxj/v2 v2.5.5
github.com/dnaeon/go-vcr/v2 v2.0.1
github.com/ghodss/yaml v1.0.0
github.com/go-enry/go-enry/v2 v2.8.0
github.com/go-git/go-git/v5 v5.4.2
github.com/go-openapi/errors v0.20.1 // indirect
github.com/go-openapi/strfmt v0.21.1 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/jedib0t/go-pretty v4.3.0+incompatible
github.com/jmoiron/sqlx v1.3.4
github.com/kevinburke/ssh_config v1.1.0 // indirect
github.com/lib/pq v1.10.4
github.com/libgit2/git2go/v33 v33.0.6
github.com/mattn/go-sqlite3 v1.14.10
github.com/muesli/reflow v0.3.0 // indirect
github.com/patrickdevivo/timediff v0.0.0-20220121234408-c77502ff7936
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.26.1
github.com/sergi/go-diff v1.2.0 // indirect
github.com/shurcooL/githubv4 v0.0.0-20220115235240-a14260e6f8a2
github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a
github.com/spf13/cobra v1.3.0
github.com/xanzy/ssh-agent v0.3.1 // indirect
go.mongodb.org/mongo-driver v1.8.2 // indirect
go.riyazali.net/sqlite v0.0.0-20211205072512-8da54dbc2d28
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
golang.org/x/mod v0.5.1
golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
golang.org/x/text v0.3.7
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
)

require (
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/go-enry/go-oniguruma v1.2.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
github.com/go-openapi/errors v0.20.1 // indirect
github.com/go-openapi/strfmt v0.21.1 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.1.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-pointer v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.9.0 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/xanzy/ssh-agent v0.3.1 // indirect
go.mongodb.org/mongo-driver v1.8.2 // indirect
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
Expand Down

0 comments on commit c4ee37e

Please sign in to comment.