From d12c61fe89d0ced78610ba6566029910404c16ce Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 26 May 2022 23:41:38 +0800 Subject: [PATCH] [test] unit-test workflow --- .github/workflows/pr-test.yml | 8 +++----- .github/workflows/release-linux.yml | 10 +++------- .github/workflows/release-macos.yml | 10 +++------- .github/workflows/unit-test.yml | 8 +++----- Makefile | 7 ++++--- 5 files changed, 16 insertions(+), 27 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index dfc67826..98a0d6d2 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [1.18] + go: [1.18.2] db: [MySQL8.0, MySQL5.7, SQLite3] if: > ${{ github.event.workflow_run.event == 'pull_request' && @@ -135,15 +135,13 @@ jobs: password: ${{ secrets.UNIT_PASS }} - name: Setup Go ${{ matrix.go }} - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: ${{ matrix.go }} - name: Setup Go Tools run: | - if [[ "${GO111MODULE}" = "on" ]]; then go mod download; fi - if [[ "${GO111MODULE}" = "on" ]]; then export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"; fi - if [[ "${GO111MODULE}" = "on" ]]; then make tools; fi + make tools - name: Setup ENV & Host env: diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index defc7b14..6e5639d3 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -14,7 +14,7 @@ jobs: release: strategy: matrix: - go: [1.18] + go: [1.18.2] runs-on: "ubuntu-latest" steps: - name: Arm Build @@ -83,17 +83,13 @@ jobs: uses: actions/checkout@v2 - name: Setup Go ${{ matrix.go }} - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: ${{ matrix.go }} - name: Setup Go Tools run: | - if [[ "${GO111MODULE}" = "on" ]]; then go mod download; fi - if [[ "${GO111MODULE}" = "on" ]]; then export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"; fi - if [[ "${GO111MODULE}" = "on" ]]; then make tools; fi - go get github.com/go-bindata/go-bindata/... - go get github.com/elazarl/go-bindata-assetfs/... + make tools - name: Make Artifacts Linux run: | diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 94e3d76c..daa2e376 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -14,7 +14,7 @@ jobs: release: strategy: matrix: - go: [1.18] + go: [1.18.2] runs-on: "macos-11" steps: - name: Install coscmd @@ -75,17 +75,13 @@ jobs: uses: actions/checkout@v2 - name: Setup Go ${{ matrix.go }} - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: ${{ matrix.go }} - name: Setup Go Tools run: | - if [[ "${GO111MODULE}" = "on" ]]; then go mod download; fi - if [[ "${GO111MODULE}" = "on" ]]; then export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"; fi - if [[ "${GO111MODULE}" = "on" ]]; then make tools; fi - go get github.com/go-bindata/go-bindata/... - go get github.com/elazarl/go-bindata-assetfs/... + make tools - name: Make Artifacts MacOS run: | diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 9e1e120c..b5f507c7 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [1.18] + go: [1.18.2] db: [MySQL8.0, MySQL5.7, SQLite3] steps: - name: Setup Cache @@ -83,15 +83,13 @@ jobs: password: ${{ secrets.UNIT_PASS }} - name: Setup Go ${{ matrix.go }} - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: ${{ matrix.go }} - name: Setup Go Tools run: | - if [[ "${GO111MODULE}" = "on" ]]; then go mod download; fi - if [[ "${GO111MODULE}" = "on" ]]; then export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"; fi - if [[ "${GO111MODULE}" = "on" ]]; then make tools; fi + make tools - name: Setup ENV & Host env: diff --git a/Makefile b/Makefile index 49f156c2..338c84f1 100644 --- a/Makefile +++ b/Makefile @@ -76,9 +76,10 @@ misspell: .PHONY: tools tools: - go install golang.org/x/lint/golint; \ - go install github.com/client9/misspell/cmd/misspell; - + go install golang.org/x/lint/golint@latest; \ + go install github.com/client9/misspell/cmd/misspell@latest; \ + go install github.com/go-bindata/go-bindata/...@latest; + # make plugin .PHONY: plugin plugin: