fix ci issues

Signed-off-by: Denis Tingaikin <denis.tingajkin@xored.com>
networkservicemesh · Apr 13, 2021 · de7893b · de7893b
1 parent c00c56a
commit de7893b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 26 deletions.
diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml
@@ -1,4 +1,3 @@
-
 ---
 name: automerge
 on:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.16
       - name: Build
         run: go build -race  ./...
       - name: Test
@@ -70,33 +70,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.16
       - run: go mod tidy
       - name: Check for changes in go.mod or go.sum
         run: |
           git diff --name-only --exit-code go.mod || ( echo "Run go tidy" && false )
           git diff --name-only --exit-code go.sum || ( echo "Run go tidy" && false )
-  gogenerate:
-    name: Check generated files
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: arduino/setup-protoc@master
-        with:
-          version: '3.8.0'
-      - uses: actions/setup-go@v1
-        with:
-          go-version: 1.15
-      - name: Install proto-gen-go
-        run: go get -u github.com/golang/protobuf/protoc-gen-go@v1.3.3
-      - name: Install proto-gen-go
-        run: go get github.com/searKing/golang/tools/cmd/go-syncmap
-      - name: Generate files
-        run: go generate ./...
-      - name: Check for changes in generated code
-        run: |
-          git diff -- '*.pb.go' || ( echo "Rerun go generate ./... locally and resubmit" && false )
-          git diff -- '*.gen.go' || ( echo "Rerun go generate ./... locally and resubmit" && false )
   excludereplace:
     name: Exclude Replace in go.mod
     runs-on: ubuntu-latest
@@ -107,4 +86,3 @@ jobs:
         run: |
           grep ^replace go.mod || exit 0
           exit 1
-
diff --git a/.github/workflows/update-dependent-repositories.yaml b/.github/workflows/update-dependent-repositories.yaml
@@ -53,7 +53,7 @@ jobs:
           token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }}
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.13.4
+          go-version: 1.16
       - name: Update ${{ matrix.repository }} locally
         working-directory: networkservicemesh/${{ matrix.repository }}
         run: |