switch to golangci-lint-action

argoproj-labs · Dec 30, 2020 · d0da61d · d0da61d
1 parent 7fcd527
commit d0da61d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,15 +17,18 @@ jobs:
         with:
           go-version: '1.15.3'
       - run: make test
-      - uses: actions-contrib/golangci-lint@v1
+      - uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.29
+          args: --timeout 5m
         env:
           GOROOT: ""
       - uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }} #required
           file: ./coverage.out
   publish:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/release-1.0')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master