upgrade go & mysql versions

Author: muraty

.github/workflows/build.yml

@@ -9,57 +9,19 @@ on:
 
 jobs:
   test:
-    name: Test
     runs-on: ubuntu-latest
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ROOT_PASSWORD: 123
-          MYSQL_DATABASE: test
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
-        ports:
-          # Maps tcp port 3306 on service container to the host
-          - 3306:3306
     steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: 1.15
-
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Lint
-        uses: golangci/golangci-lint-action@v2
+      - name: Set up Go
+        uses: actions/setup-go@v4
         with:
-          version: v1.31
+          go-version: '1.23'
 
-      - name: Get dependencies
-        run: go mod download
-
-      - name: Test
-        run: go test -race -v -covermode atomic -coverprofile=covprofile ./...
+      - name: Run tests
+        run: make test
 
       - name: Send coverage
         uses: shogo82148/actions-goveralls@v1
         with:
-          path-to-profile: covprofile
-
-  goreleaser:
-    name: Build and release binary
-    needs: test
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/v')
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: 1.15
-      - uses: goreleaser/goreleaser-action@v2.2.1
-        with:
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          path-to-profile: ./coverage/covprofile

.github/workflows/release.yml

@@ -0,0 +1,27 @@
+name: release
+on:
+  release:
+    types:
+      - created
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      -
+        name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.23.1
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          version: '~> v2'
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile-mysql

@@ -0,0 +1,29 @@
+.PHONY: build up test lint
+
+NAME := pas
+
+build:
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o $(NAME)
+
+MAIN_COMPOSE := docker compose -f ./build/docker-compose.yml
+build-docker:
+	$(MAIN_COMPOSE) build pas
+	mkdir -p ./bin
+	docker create --name pas-builder pas
+	docker cp pas-builder:/usr/local/bin/pas - > ./bin/pas
+	docker rm -v pas-builder
+
+MAIN_COMPOSE := docker compose -f ./build/docker-compose.yml
+up:
+	$(MAIN_COMPOSE) build pas
+	$(MAIN_COMPOSE) rm -fsv
+	$(MAIN_COMPOSE) up pas --build --abort-on-container-exit
+
+TEST_COMPOSE := docker compose -f ./build/docker-compose-test.yml
+test:
+	$(TEST_COMPOSE) rm -fsv
+	mkdir -p ./coverage
+	$(TEST_COMPOSE) up pas-test --build --exit-code-from pas-test --abort-on-container-exit
+
+lint:
+	golangci-lint run

Makefile

@@ -0,0 +1,22 @@
+services:
+  mysql:
+    image: pas/mysql
+    container_name: pas-mysql
+    build:
+      dockerfile: ./build/mysql/Dockerfile
+      context: ..
+    environment:
+      MYSQL_DATABASE: pas
+      MYSQL_USER: pas
+      MYSQL_PASSWORD: 123
+  pas-test:
+    image: pas/test
+    container_name: pas-test
+    build:
+      dockerfile: ./build/test/Dockerfile
+      context: ..
+    depends_on:
+      - mysql
+    tty: true
+    volumes:
+      - ../coverage:/coverage

build/docker-compose-test.yml

@@ -1,19 +1,18 @@
-version: '3.2'
 services:
   mysql:
-    image: pas-mysql
+    image: pas/mysql
     container_name: pas-mysql
     build:
-      dockerfile: Dockerfile-mysql
-      context: .
+      dockerfile: ./build/mysql/Dockerfile
+      context: ..
     ports:
       - "3306:3306"
   pas:
     image: pas
     container_name: pas
     build:
-      dockerfile: Dockerfile-pas
-      context: .
+      dockerfile: ./build/pas/Dockerfile
+      context: ..
     depends_on:
       - mysql
     ports:

docker-compose.yml build/docker-compose.ymldocker-compose.yml renamed to build/docker-compose.yml

@@ -0,0 +1,6 @@
+FROM mysql:8
+
+ENV MYSQL_USER=pas \
+    MYSQL_PASSWORD=123 \
+    MYSQL_DATABASE=pas \
+    MYSQL_RANDOM_ROOT_PASSWORD=1

build/mysql/Dockerfile

@@ -1,6 +1,6 @@
-FROM golang:1.15
+FROM golang:1.23.1
 
-WORKDIR /src
+WORKDIR /pas
 COPY go.* ./
 RUN go mod download
 

Dockerfile-pas build/pas/DockerfileDockerfile-pas renamed to build/pas/Dockerfile

@@ -0,0 +1,17 @@
+FROM golang:1.23.1 AS builder
+
+# Install mysql
+RUN apt-get update && \
+    apt-get -y install --no-install-recommends default-mysql-client && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /pas
+
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
+
+COPY ./build/test/entrypoint.sh /root/entrypoint.sh
+COPY . .
+
+ENTRYPOINT ["/bin/bash", "/root/entrypoint.sh"]

build/test/Dockerfile

@@ -0,0 +1,18 @@
+#!/bin/bash -ex
+
+mysql=(mysql -hmysql -upas -p123)
+max_attempts=30
+attempt=0
+
+until "${mysql[@]}" -e "select 1" &>/dev/null ; do
+  attempt=$(( attempt + 1 ))
+  if [ $attempt -ge $max_attempts ]; then
+    echo "Error: MySQL did not become ready within $max_attempts attempts"
+    exit 1
+  fi
+  echo "MySQL is not ready yet... (attempt $attempt/$max_attempts)"
+  sleep 1
+done
+echo "MySQL is ready."
+
+exec go test -v -race -covermode atomic -coverprofile=/coverage/covprofile ./...