Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Golang/ruby upgrades #357

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
github-pages:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Build documentations
run: .github/workflows/build-docs.sh
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runner: [ubuntu-latest, shopify-ubuntu-arm64]
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: 1.22.1

- name: Building Ghostferry
run: .github/workflows/build-deb.sh
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
needs: build-debs
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Fetch uploaded artifacts
uses: actions/download-artifact@v3
with:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
CI: "true"
MYSQL_VERSION: "8.0"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: 1.22.1

- name: Starting up MySQL
run: .github/workflows/start-mysql.sh
Expand All @@ -33,12 +33,12 @@ jobs:
CI: "true"
MYSQL_VERSION: "8.0"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: 1.22.1

- name: Starting up MySQL
run: .github/workflows/start-mysql.sh
Expand All @@ -53,12 +53,12 @@ jobs:
BUNDLE_WITHOUT: "development"
MYSQL_VERSION: "8.0"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Golang
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: 1.22.1

- name: Setup Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -77,12 +77,12 @@ jobs:
runner: [ubuntu-latest, shopify-ubuntu-arm64]
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: 1.22.1

- name: Building Ghostferry
run: .github/workflows/build-deb.sh
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/tests_5.7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
CI: "true"
MYSQL_VERSION: "5.7"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: 1.22.1

- name: Starting up MySQL
run: .github/workflows/start-mysql.sh
Expand All @@ -33,12 +33,12 @@ jobs:
CI: "true"
MYSQL_VERSION: "5.7"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: 1.22.1

- name: Starting up MySQL
run: .github/workflows/start-mysql.sh
Expand All @@ -53,12 +53,12 @@ jobs:
MYSQL_VERSION: "5.7"
BUNDLE_WITHOUT: "development"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Golang
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16
go-version: 1.22.1

- name: Setup Ruby
uses: ruby/setup-ruby@v1
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.3.3
11 changes: 4 additions & 7 deletions dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ env:
MYSQL_VERSION: "8.0"

up:
- homebrew:
- [email protected]:
or: [[email protected]]
conflicts: [mysql-connector-c, mysql, mysql-client]

- ruby: "3.2.2"
- packages:
- mysql-client
- ruby
- bundler
- go:
version: "1.16"
version: "1.22.1"
- podman
- custom:
name: Go Dependencies
Expand Down
61 changes: 41 additions & 20 deletions gemset.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
type = "gem";
};
version = "5.14.4";
version = "5.20.0";
};
minitest-fail-fast = {
dependencies = ["minitest"];
Expand All @@ -72,76 +72,97 @@
};
minitest-hooks = {
dependencies = ["minitest"];
groups = ["default"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05z8r6sw3fz4s44fs1150ndlcmcy82vlxmhps5nncg8vk59k3gmf";
sha256 = "04lkyfj0s1nf543q8vg2ycl8df9j12dfjfi3sa4hv2mxnx875r03";
type = "gem";
};
version = "1.5.0";
version = "1.5.1";
};
minitest-reporters = {
dependencies = ["ansi" "builder" "minitest" "ruby-progressbar"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pj98s2rza8c38crh35lcrv59w7qr13g09swfh5aqabl3552xxr6";
sha256 = "0f7wq2hvg2ci46s0shgwbbv0m39n6si5rx82jjias3dldbj79zpq";
type = "gem";
};
version = "1.6.1";
};
minitest-retry = {
dependencies = ["minitest"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c1zq0b1a9y0hbqphq4ybijnjldlis1g6kyhx92q2ynnqfmzhfga";
type = "gem";
};
version = "1.4.3";
version = "0.2.2";
};
mysql2 = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw";
sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn";
type = "gem";
};
version = "0.5.3";
version = "0.5.5";
};
pry = {
dependencies = ["coderay" "method_source"];
groups = ["default"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk";
sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4";
type = "gem";
};
version = "0.13.1";
version = "0.14.2";
};
pry-byebug = {
dependencies = ["byebug" "pry"];
groups = ["default"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv";
sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8";
type = "gem";
};
version = "3.9.0";
version = "3.10.1";
};
ruby-progressbar = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
type = "gem";
};
version = "1.11.0";
version = "1.13.0";
};
tqdm = {
groups = ["default"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nwbyng877lblvwrvpvsaa8jxaylw35zqf68wf29yj30nrz55m6a";
type = "gem";
};
version = "0.4.1";
};
webrick = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xmc2y990s0k3yydijyqifkgirzhlicb0p7b12habcksfs0h4rna";
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
version = "0.3.0";
version = "1.8.1";
};
}
23 changes: 16 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
module github.com/Shopify/ghostferry

go 1.14
go 1.22.1

require (
github.com/DataDog/datadog-go v4.8.2+incompatible
github.com/Masterminds/squirrel v0.0.0-20180620232226-b127ed9be034
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/go-mysql-org/go-mysql v1.4.1-0.20220112102103-b3f1a27311d8
github.com/go-sql-driver/mysql v1.5.0
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db
github.com/gorilla/context v1.1.1 // indirect
github.com/gorilla/mux v1.6.1
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.4.0
)

require (
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gorilla/context v1.1.1 // indirect
github.com/lann/builder v0.0.0-20180216234317-1b87b36280d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/lib/pq v1.3.0 // indirect
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712 // indirect
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.4.0
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 // indirect
go.uber.org/atomic v1.7.0 // indirect
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/yaml.v2 v2.2.4 // indirect
Expand Down
Loading
Loading