Skip to content

Commit

Permalink
Merge 732ec28 into 9fad5c7
Browse files Browse the repository at this point in the history
  • Loading branch information
AstroProfundis authored Sep 1, 2021
2 parents 9fad5c7 + 732ec28 commit ccb2ef6
Show file tree
Hide file tree
Showing 16 changed files with 843 additions and 681 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrate-cluster-cmd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrate-cluster-scale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrate-dm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrate-playground.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
id: go

- name: Check out code into the Go module directory
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integrate-tiup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
id: go

- name: Check out code into the Go module directory
Expand Down Expand Up @@ -85,10 +85,10 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
path: go/src/github.com/${{ github.repository }}

- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
id: go

- name: make unit-test
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-tiup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
env:
working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
steps:
- name: Set up Go 1.16
- name: Set up Go 1.17
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x
id: go

- name: Check out code into the Go module directory
Expand Down Expand Up @@ -89,8 +89,8 @@ jobs:
fi
echo ::set-output name=REL_VER::$REL_VER
BUILD_FLAGS='-trimpath -buildmode=pie' make build && \
BUILD_FLAGS='-trimpath -buildmode=pie' make ctl && \
BUILD_FLAGS='-trimpath' make build && \
BUILD_FLAGS='-trimpath' make ctl && \
echo "Build success."
checksum_file=checksum.${{ matrix.os }}-${{ matrix.arch }}.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reprotest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
matrix:
go:
- 1.16.x
- 1.17.x

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
2 changes: 1 addition & 1 deletion components/bench/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/go-sql-driver/mysql v1.6.0
github.com/magiconair/properties v1.8.5
github.com/pingcap/go-tpc v1.0.7
github.com/pingcap/go-ycsb v0.0.0-20210422030059-021df3b60d69
github.com/pingcap/go-ycsb v0.0.0-20210727125954-0c816a248fc3
github.com/prometheus/common v0.26.0 // indirect
github.com/spf13/cobra v1.1.3
)
412 changes: 339 additions & 73 deletions components/bench/go.sum

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions components/client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/tiup/components/client
go 1.16

require (
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/gizak/termui/v3 v3.1.0
github.com/google/flatbuffers v2.0.0+incompatible // indirect
github.com/shirou/gopsutil v3.21.5+incompatible
github.com/spf13/cobra v1.1.3
github.com/tklauser/go-sysconf v0.3.6 // indirect
github.com/xo/usql v0.9.1
github.com/shirou/gopsutil v3.21.8+incompatible
github.com/spf13/cobra v1.2.1
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/xo/usql v0.9.4
)
Loading

0 comments on commit ccb2ef6

Please sign in to comment.