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

Apply goimports before checking make sizegen #8828

Merged
merged 11 commits into from
Sep 17, 2021
Merged
5 changes: 4 additions & 1 deletion .github/docker/cluster_test_vreplication_basic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
# create the vtdataroot directory
RUN mkdir -p $VTDATAROOT

# sleep for 50 minutes
# install goimports
RUN go install golang.org/x/tools/cmd/goimports@latest

# sleep for 50 minutes
CMD sleep 3000
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
# create the vtdataroot directory
RUN mkdir -p $VTDATAROOT

# sleep for 50 minutes
# install goimports
RUN go install golang.org/x/tools/cmd/goimports@latest

# sleep for 50 minutes
CMD sleep 3000
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
# create the vtdataroot directory
RUN mkdir -p $VTDATAROOT

# sleep for 50 minutes
# install goimports
RUN go install golang.org/x/tools/cmd/goimports@latest

# sleep for 50 minutes
CMD sleep 3000
5 changes: 4 additions & 1 deletion .github/docker/cluster_test_vreplication_v2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@ ENV VTDATAROOT /vt/vtdataroot
# create the vtdataroot directory
RUN mkdir -p $VTDATAROOT

# sleep for 50 minutes
# install goimports
RUN go install golang.org/x/tools/cmd/goimports@latest

# sleep for 50 minutes
CMD sleep 3000
5 changes: 4 additions & 1 deletion .github/docker/unit_test_mariadb103/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ ENV VTDATAROOT /vt/vtdataroot
# create the vtdataroot directory
RUN mkdir -p $VTDATAROOT

# install goimports
RUN go install golang.org/x/tools/cmd/goimports@latest

# make tools
RUN make tools

# sleep for 50 minutes
# sleep for 50 minutes
CMD sleep 3000
5 changes: 4 additions & 1 deletion .github/docker/unit_test_mysql57/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ ENV VTDATAROOT /vt/vtdataroot
# create the vtdataroot directory
RUN mkdir -p $VTDATAROOT

# install goimports
RUN go install golang.org/x/tools/cmd/goimports@latest

# make tools
RUN make tools

# sleep for 50 minutes
# sleep for 50 minutes
CMD sleep 3000
4 changes: 2 additions & 2 deletions .github/workflows/check_formatting.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: check_formatting
on: [pull_request]
on: [pull_request,push]
jobs:

build:
Expand All @@ -8,7 +8,7 @@ jobs:
steps:

- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/check_imports.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: check_imports
on: [pull_request,push]
jobs:

build:
name: Check Imports
runs-on: ubuntu-latest
steps:

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

- name: Check out code
uses: actions/checkout@v2

- name: Install goimports
run: |
go install golang.org/x/tools/cmd/goimports@latest

- name: Run goimports
run: |
out=$(goimports -local vitess.io/vitess -l -w $(find . -name "*.go" | grep -v ".pb.go"))
echo $out | grep go > /dev/null && echo -e "The following files are malformatted:\n$out" && exit 1 || echo "All the files are formatted correctly"
2 changes: 1 addition & 1 deletion .github/workflows/check_make_parser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:

- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/check_make_sizegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:

- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand All @@ -34,6 +34,7 @@ jobs:
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
go mod download
go install golang.org/x/tools/cmd/goimports@latest
- name: Run make minimaltools
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_make_visitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:

- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_13.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_15.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_16.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_18.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_19.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_20.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_21.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_23.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_26.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_mysql80.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_onlineddl_ghost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_onlineddl_revert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_onlineddl_vrepl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_resharding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_resharding_bytes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: 1.17

Expand Down
Loading