Merge lint & build

FACT-Finder · Jun 15, 2022 · cae5db4 · cae5db4
1 parent 8fb3ba8
commit cae5db4
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,10 +26,14 @@ jobs:
       - uses: actions/checkout@v2
       - run: (cd ui && yarn)
       - run: (cd ui && yarn build)
-      - run: go install github.com/deepmap/oapi-codegen/pkg/[email protected]
+      - run: go install github.com/deepmap/oapi-codegen/cmd/oapi-[email protected]
       - run: go generate ./...
       - run: go test ./...
       - run: go build
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.46
       - if: startsWith(github.ref, 'refs/tags/v')
         run: echo "$DOCKER_PASS" | docker login --username "$DOCKER_USER" --password-stdin
         env:
@@ -42,12 +46,3 @@ jobs:
           args: release --skip-validate
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          version: v1.46