Reorganise CI

.github/workflows/cd.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.20
 
       - name: Login to Docker Hub
         uses: docker/login-action@v1
@@ -29,4 +29,4 @@ jobs:
           version: latest
           args: release --rm-dist
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -3,7 +3,8 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - master
+      - main
+      - devel
   pull_request:
 
 env:
@@ -14,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        go: [ 1.15 ]
+        go: [ '1.20' ]
     name: ${{ matrix.os }} @ Go ${{ matrix.go }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -35,18 +36,18 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          go get -v golang.org/x/lint/golint
           go get -v github.com/golang/mock/mockgen@v1.4.4
 
+      - name: Generate mock file
+        run: go generate -v ./...
+
       - name: Lint source code
-        run: golint -set_exit_status ./...
+        run: go vet -v ./...
 
       - name: Run Tests
-        run: |
-          go generate ./...
-          go test -race --coverprofile=coverage.coverprofile --covermode=atomic -v ./...
+        run: go test -race --coverprofile=coverage.coverprofile --covermode=atomic -v ./...
 
       - name: Update go report card
         if: success() && matrix.os == 'ubuntu-latest'
         continue-on-error: true
-        uses: creekorful/goreportcard-action@v1.0
+        uses: creekorful/goreportcard-action@v1.0

.goreleaser.yaml

@@ -51,41 +51,41 @@ dockers:
   - goos: linux
     goarch: amd64
     image_templates:
-      - "darkspot/bs-blacklister:latest"
-      - "darkspot/bs-blacklister:{{ replace .Tag \"v\" \"\" }}"
-      - "darkspot/bs-blacklister:{{ .Major }}"
+      - "creekorful/bs-blacklister:latest"
+      - "creekorful/bs-blacklister:{{ replace .Tag \"v\" \"\" }}"
+      - "creekorful/bs-blacklister:{{ .Major }}"
     skip_push: false
     dockerfile: build/docker/Dockerfile.blacklister
   - goos: linux
     goarch: amd64
     image_templates:
-      - "darkspot/bs-configapi:latest"
-      - "darkspot/bs-configapi:{{ replace .Tag \"v\" \"\" }}"
-      - "darkspot/bs-configapi:{{ .Major }}"
+      - "creekorful/bs-configapi:latest"
+      - "creekorful/bs-configapi:{{ replace .Tag \"v\" \"\" }}"
+      - "creekorful/bs-configapi:{{ .Major }}"
     skip_push: false
     dockerfile: build/docker/Dockerfile.configapi
   - goos: linux
     goarch: amd64
     image_templates:
-      - "darkspot/bs-crawler:latest"
-      - "darkspot/bs-crawler:{{ replace .Tag \"v\" \"\" }}"
-      - "darkspot/bs-crawler:{{ .Major }}"
+      - "creekorful/bs-crawler:latest"
+      - "creekorful/bs-crawler:{{ replace .Tag \"v\" \"\" }}"
+      - "creekorful/bs-crawler:{{ .Major }}"
     skip_push: false
     dockerfile: build/docker/Dockerfile.crawler
   - goos: linux
     goarch: amd64
     image_templates:
-      - "darkspot/bs-indexer:latest"
-      - "darkspot/bs-indexer:{{ replace .Tag \"v\" \"\" }}"
-      - "darkspot/bs-indexer:{{ .Major }}"
+      - "creekorful/bs-indexer:latest"
+      - "creekorful/bs-indexer:{{ replace .Tag \"v\" \"\" }}"
+      - "creekorful/bs-indexer:{{ .Major }}"
     skip_push: false
     dockerfile: build/docker/Dockerfile.indexer
   - goos: linux
     goarch: amd64
     image_templates:
-      - "darkspot/bs-scheduler:latest"
-      - "darkspot/bs-scheduler:{{ replace .Tag \"v\" \"\" }}"
-      - "darkspot/bs-scheduler:{{ .Major }}"
+      - "creekorful/bs-scheduler:latest"
+      - "creekorful/bs-scheduler:{{ replace .Tag \"v\" \"\" }}"
+      - "creekorful/bs-scheduler:{{ .Major }}"
     skip_push: false
     dockerfile: build/docker/Dockerfile.scheduler
 checksum:
@@ -93,4 +93,4 @@ checksum:
 snapshot:
   name_template: "{{ .Tag }}-{{ .ShortCommit }}"
 release:
-  prerelease: true
+  prerelease: true

CHANGELOG.md

@@ -25,10 +25,10 @@ First stable release.
 
 Initial stable release candidate.
 
-[Unreleased]: https://github.com/darkspot-org/bathyscaphe/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/creekorful/bathyscaphe/compare/v1.0.0...HEAD
 
 [1.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.0.0-rc2...v1.0.0
 
 [1.0.0-rc2]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.0.0-rc1...v1.0.0-rc2
 
-[1.0.0-rc1]: https://github.com/darkspot-org/bathyscaphe/releases/tag/v1.0.0-rc1
+[1.0.0-rc1]: https://github.com/creekorful/bathyscaphe/releases/tag/v1.0.0-rc1

README.md

@@ -1,6 +1,6 @@
 # Bathyscaphe dark web crawler
 
-![CI](https://github.com/darkspot-org/bathyscaphe/workflows/CI/badge.svg)
+![CI](https://github.com/creekorful/bathyscaphe/workflows/CI/badge.svg)
 
 Bathyscaphe is a Go written, fast, highly configurable, cloud-native dark web crawler.
 

deployments/docker/docker-compose.yml

@@ -29,7 +29,7 @@ services:
     volumes:
       - redisdata:/data
   crawler:
-    image: darkspot/bs-crawler:latest
+    image: creekorful/bs-crawler:latest
     command: >
       --log-level debug
       --event-srv amqp://guest:guest@rabbitmq:5672
@@ -41,7 +41,7 @@ services:
       - torproxy
       - configapi
   scheduler:
-    image: darkspot/bs-scheduler:latest
+    image: creekorful/bs-scheduler:latest
     command: >
       --log-level debug
       --event-srv amqp://guest:guest@rabbitmq:5672
@@ -54,7 +54,7 @@ services:
       - configapi
       - redis
   indexer-local:
-    image: darkspot/bs-indexer:latest
+    image: creekorful/bs-indexer:latest
     command: >
       --log-level debug
       --event-srv amqp://guest:guest@rabbitmq:5672
@@ -68,7 +68,7 @@ services:
       - rabbitmq
       - configapi
   indexer-es:
-    image: darkspot/bs-indexer:latest
+    image: creekorful/bs-indexer:latest
     command: >
       --log-level debug
       --event-srv amqp://guest:guest@rabbitmq:5672
@@ -82,7 +82,7 @@ services:
       - elasticsearch
       - configapi
   configapi:
-    image: darkspot/bs-configapi:latest
+    image: creekorful/bs-configapi:latest
     command: >
       --log-level debug
       --event-srv amqp://guest:guest@rabbitmq:5672
@@ -98,7 +98,7 @@ services:
     ports:
       - 15006:8080
   blacklister:
-    image: darkspot/bs-blacklister:latest
+    image: creekorful/bs-blacklister:latest
     command: >
       --log-level debug
       --event-srv amqp://guest:guest@rabbitmq:5672

deployments/k8s/blacklister.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: blacklister
-          image: darkspot/bs-blacklister:latest
+          image: creekorful/bs-blacklister:latest
           args:
             - --log-level
             - debug

deployments/k8s/configapi.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: configapi
-          image: darkspot/bs-configapi:latest
+          image: creekorful/bs-configapi:latest
           args:
             - --log-level
             - debug

deployments/k8s/crawler.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: crawler
-          image: darkspot/bs-crawler:latest
+          image: creekorful/bs-crawler:latest
           args:
             - --log-level
             - debug

deployments/k8s/indexer-es.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: indexer
-          image: darkspot/bs-indexer:latest
+          image: creekorful/bs-indexer:latest
           args:
             - --log-level
             - debug

deployments/k8s/scheduler.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: scheduler
-          image: darkspot/bs-scheduler:latest
+          image: creekorful/bs-scheduler:latest
           args:
             - --log-level
             - debug