Lint: Fix linter errors

Signed-off-by: Knut Ahlers <knut@ahlers.me>

.github/workflows/test-and-build.yml

@@ -16,7 +16,7 @@ jobs:
         shell: bash
 
     container:
-      image: luzifer/gh-arch-env
+      image: luzifer/archlinux
       env:
         CGO_ENABLED: 0
         GOPATH: /go
@@ -24,18 +24,32 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Enable custom AUR package repo
+        run: echo -e "[luzifer]\nSigLevel = Never\nServer = https://archrepo.hub.luzifer.io/\$arch" >>/etc/pacman.conf
+
+      - name: Install required packages
+        run: |
+          pacman -Syy --noconfirm \
+            awk \
+            git \
+            go \
+            golangci-lint-bin \
+            make \
+            tar \
+            zip
+
+      - uses: actions/checkout@v3
 
       - name: Marking workdir safe
         run: git config --global --add safe.directory /__w/staticmap/staticmap
 
-      - name: 'Lint and test code'
-        run: |
-          go test -cover -v ./...
-          golangci-lint run ./...
-
       - name: Build release
-        run: bash ci/build.sh
+        run: make publish
+        env:
+          FORCE_SKIP_UPLOAD: 'true'
+          MOD_MODE: readonly
+          NO_TESTS: 'true'
+          PACKAGES: '.'
 
       - name: Extract changelog
         run: 'awk "/^#/ && ++c==2{exit}; /^#/f" "History.md" | tail -n +2 >release_changelog.md'

ci/build.sh

@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-osarch=(
-  darwin/amd64
-  darwin/arm64
-  linux/amd64
-  linux/arm
-  linux/arm64
-  windows/amd64
-)
-
-function go_package() {
-  cd "${4}"
-
-  local outname="${3}"
-  [[ $1 == windows ]] && outname="${3}.exe"
-
-  log "=> Building ${3} for ${1}/${2}..."
-  CGO_ENABLED=0 GOARCH=$2 GOOS=$1 go build \
-    -ldflags "-s -w -X main.version=${version}" \
-    -mod=readonly \
-    -trimpath \
-    -o "${outname}"
-
-  if [[ $1 == linux ]]; then
-    log "=> Packging ${3} as ${3}_${1}_${2}.tgz..."
-    tar -czf "${builddir}/${3}_${1}_${2}.tgz" "${outname}"
-  else
-    log "=> Packging ${3} as ${3}_${1}_${2}.zip..."
-    zip "${builddir}/${3}_${1}_${2}.zip" "${outname}"
-  fi
-
-  rm "${outname}"
-}
-
-function go_package_all() {
-  for oa in "${osarch[@]}"; do
-    local os=$(cut -d / -f 1 <<<"${oa}")
-    local arch=$(cut -d / -f 2 <<<"${oa}")
-    (go_package "${os}" "${arch}" "${1}" "${2}")
-  done
-}
-
-function log() {
-  echo "[$(date +%H:%M:%S)] $@" >&2
-}
-
-root=$(pwd)
-builddir="${root}/.build"
-version="$(git describe --tags --always || echo dev)"
-
-log "Building version ${version}..."
-
-log "Resetting output directory..."
-rm -rf "${builddir}"
-mkdir -p "${builddir}"
-
-log "Building Server..."
-go_package_all "staticmap" "."
-
-log "Generating SHA256SUMS file..."
-(cd "${builddir}" && sha256sum * | tee SHA256SUMS)