From ef0bd953fb23fedfcc3583bce37a4fcf0134122b Mon Sep 17 00:00:00 2001 From: Lz Date: Fri, 22 Apr 2022 16:36:11 +0800 Subject: [PATCH] fix(Makefile): improve gomod-download --- .github/workflows/build-zbox.yaml | 12 ++++++------ .github/workflows/build-zboxcli.yml | 10 +++++----- Makefile | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-zbox.yaml b/.github/workflows/build-zbox.yaml index 680dac10..0885fdea 100644 --- a/.github/workflows/build-zbox.yaml +++ b/.github/workflows/build-zbox.yaml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Setup go 1.16 + - name: Setup go 1.18 uses: actions/setup-go@v2 with: - go-version: '1.16' # The Go version to download (if necessary) and use. + go-version: '1.18' # The Go version to download (if necessary) and use. - name: Checkout uses: actions/checkout@v2 @@ -63,10 +63,10 @@ jobs: name: Build-windows runs-on: windows-latest steps: - - name: Setup go 1.16 + - name: Setup go 1.18 uses: actions/setup-go@v2 with: - go-version: '1.16' # The Go version to download (if necessary) and use. + go-version: '1.18' # The Go version to download (if necessary) and use. - name: Checkout uses: actions/checkout@v2 @@ -112,10 +112,10 @@ jobs: runs-on: macos-latest steps: - - name: Setup go 1.16 + - name: Setup go 1.18 uses: actions/setup-go@v2 with: - go-version: '1.16' # The Go version to download (if necessary) and use. + go-version: '1.18' # The Go version to download (if necessary) and use. - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/build-zboxcli.yml b/.github/workflows/build-zboxcli.yml index 93ccbc71..4e564fb2 100644 --- a/.github/workflows/build-zboxcli.yml +++ b/.github/workflows/build-zboxcli.yml @@ -27,7 +27,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: ^1.14 + go-version: ^1.18 - name: Install run: make install @@ -97,10 +97,10 @@ jobs: name: Build-windows runs-on: windows-latest steps: - - name: Setup go 1.16 + - name: Setup go 1.18 uses: actions/setup-go@v2 with: - go-version: '1.16' # The Go version to download (if necessary) and use. + go-version: '1.18' # The Go version to download (if necessary) and use. - name: Checkout uses: actions/checkout@v2 @@ -125,10 +125,10 @@ jobs: runs-on: macos-latest steps: - - name: Setup go 1.16 + - name: Setup go 1.18 uses: actions/setup-go@v2 with: - go-version: '1.16' # The Go version to download (if necessary) and use. + go-version: '1.18' # The Go version to download (if necessary) and use. - name: Checkout uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index 24da2ab4..ca37a3d4 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ default: help show #GO BUILD SDK gomod-download: go mod download + go mod tidy gomod-clean: go clean -i -r -x -modcache ./...