Fix CI

Author: ptman

.github/workflows/ci.yml

@@ -0,0 +1,74 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
+      - name: Lint
+        run: make lint
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
+      - name: Test
+        run: make test
+
+  test-integration:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_DB: postgres
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U postgres -d postgres"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
+      - name: Create config.json
+        run: |
+          cat > config.json <<'EOF'
+          {
+              "Listen": ":8080",
+              "DB": "host=127.0.0.1 port=5432 user=postgres password=postgres dbname=postgres sslmode=disable",
+              "Debug": false,
+              "RealIPHeader": "X-Forwarded-For",
+              "RemoteUserHeader": "X-Remote-User"
+          }
+          EOF
+
+      - name: Integration tests
+        run: make test-all

.gitlab-ci.yml

@@ -1,5 +1,38 @@
-image: golang
+image: golang:1.26
+
+stages:
+  - lint
+  - test
+  - integration
+
+lint:
+  stage: lint
+  script:
+    - make lint
 
 test:
+  stage: test
   script:
     - make test
+
+test-integration:
+  stage: integration
+  services:
+    - name: postgres:16
+      alias: postgres
+  variables:
+    POSTGRES_DB: postgres
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: postgres
+  script:
+    - |
+      cat > config.json <<'EOF'
+      {
+          "Listen": ":8080",
+          "DB": "host=postgres user=postgres password=postgres dbname=postgres sslmode=disable",
+          "Debug": false,
+          "RealIPHeader": "X-Forwarded-For",
+          "RemoteUserHeader": "X-Remote-User"
+      }
+      EOF
+    - make test-all

Makefile

@@ -13,6 +13,10 @@ run: urlredir
 
 .PHONY: test
 test:
+	CGO_ENABLED=0 go test -short -shuffle=on -vet=all -v
+
+.PHONY: test-all
+test-all:
 	CGO_ENABLED=0 go test -shuffle=on -vet=all -v
 
 .PHONY: cover
@@ -23,7 +27,8 @@ cover:
 .PHONY: lint
 lint:
 	CGO_ENABLED=0 go tool golangci-lint run --default all \
-		    --disable varnamelen,depguard
+		    --disable varnamelen,depguard,wsl,noinlineerr \
+		    --enable wsl_v5
 
 .PHONY: cloc
 cloc:

README.md

@@ -26,10 +26,14 @@ Run:
 
 ## Testing
 
-The test-target runs only a subset of tests, but works without config:
+Unit tests run in short mode and work without local Postgres/config:
 
     make test
 
+Integration tests require config and a reachable Postgres database:
+
+    make test-all
+
 Coverage needs the config (for database connection details):
 
     make cover