Updated dependencies (#34)

* Updated dependencies

* Upgraded Chromium to 111.0.5563.0

* Updated build script

* Typo

.github/workflows/build.yml

@@ -12,15 +12,24 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
 
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
           go-version: ^1.19
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+      - name: Set up linters
+        run: make install-tools
+
+      - name: Lint
+        run: |
+          make lint
+          make fmt
+          git diff
+          if [[ $(git diff) != '' ]]; then echo 'Invalid formatting!' >&2; exit 1; fi
 
       - name: Get dependencies
         run: |

Dockerfile

@@ -13,7 +13,7 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux make compile
 
 # Build the final container. And install
-FROM montferret/chromium:106.0.5249.0 as runner
+FROM montferret/chromium:111.0.5563.0 as runner
 
 RUN apt-get update && apt-get install -y dumb-init
 

Dockerfile.release

@@ -1,4 +1,4 @@
-FROM montferret/chromium:106.0.5249.0
+FROM montferret/chromium:111.0.5563.0
 
 RUN apt-get update && apt-get install -y dumb-init ca-certificates
 

Makefile

@@ -9,11 +9,27 @@ compile:
 	-ldflags "-X main.version=${VERSION} -X main.ferretVersion=${FERRET_VERSION}" \
 	./main.go
 
+install-tools:
+	go install honnef.co/go/tools/cmd/staticcheck@latest && \
+	go install golang.org/x/tools/cmd/goimports@latest && \
+	go install github.com/mgechev/revive@latest
+
+install-packages:
+	go mod tidy
+
+install: install-tools install-packages
+
 test:
 	go test ./
 
 start:
 	./bin/worker
 
 fmt:
-	go fmt ./...
+	go fmt ./... && \
+	goimports -w -local github.com/MontFerret ./internal ./pkg main.go
+
+lint:
+	go vet ./... && \
+	staticcheck ./... && \
+	revive -config revive.toml -formatter stylish -exclude ./pkg/parser/fql/... -exclude ./vendor/... ./...

go.mod

@@ -3,42 +3,43 @@ module github.com/MontFerret/worker
 go 1.19
 
 require (
-	github.com/MontFerret/ferret v0.16.7
+	github.com/MontFerret/ferret v0.18.0
 	github.com/go-waitfor/waitfor v1.0.0
 	github.com/go-waitfor/waitfor-http v1.0.0
-	github.com/hashicorp/golang-lru/v2 v2.0.1
-	github.com/labstack/echo/v4 v4.9.1
+	github.com/hashicorp/golang-lru/v2 v2.0.2
+	github.com/labstack/echo/v4 v4.10.2
 	github.com/namsral/flag v1.7.4-pre
 	github.com/pkg/errors v0.9.1
-	github.com/rs/zerolog v1.28.0
-	github.com/ziflex/lecho/v3 v3.3.0
+	github.com/rs/zerolog v1.29.0
+	github.com/ziflex/lecho/v3 v3.5.0
 )
 
 require (
-	github.com/PuerkitoBio/goquery v1.8.0 // indirect
+	github.com/PuerkitoBio/goquery v1.8.1 // indirect
 	github.com/andybalholm/cascadia v1.3.1 // indirect
-	github.com/antchfx/htmlquery v1.2.5 // indirect
-	github.com/antchfx/xpath v1.2.1 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211211185417-43fb4c2dbe28 // indirect
+	github.com/antchfx/htmlquery v1.3.0 // indirect
+	github.com/antchfx/xpath v1.2.4 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/corpix/uarand v0.1.1 // indirect
+	github.com/corpix/uarand v0.2.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
-	github.com/mafredri/cdp v0.32.0 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/sethgrid/pester v1.1.0 // indirect
+	github.com/mafredri/cdp v0.34.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/sethgrid/pester v1.2.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
+	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/wI2L/jettison v0.7.4 // indirect
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220318055525-2edf467146b5 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
 )