feat(ci): restructuring workflows

Author: Soft-Serve

.github/workflows/docker.yml .github/workflows/docker-test.yml.github/workflows/docker.yml renamed to .github/workflows/docker-test.yml

@@ -1,16 +1,19 @@
-name: Docker build
+name: Docker test builds
 
 on:
   push:
-    branches: [main, golang]
+    branches: [main]
   pull_request:
     branches: [main]
 
 jobs:
-  build:
-    name: Docker Build
+  docker:
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [gitops, repo-server]
+    name: docker build
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' || github.event_name == 'pull_request'
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -23,5 +26,4 @@ jobs:
         with:
           platforms: linux/amd64
           push: false
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+          file: docker/${{ matrix.image }}/Dockerfile

.github/workflows/golang-tests.yml

@@ -9,11 +9,7 @@ on:
 jobs:
   test:
     name: Golang tests
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -24,7 +20,7 @@ jobs:
         with:
           go-version: 1.24
       - name: start soft-serve
-        run: .//hack/soft-serve/start.sh
+        run: ./hack/soft-serve/start.sh
       - name: run golang tests
         env:
           SOPS_AGE_KEY_FILE: ${{ github.workspace }}/test_assets/keys.txt

.github/workflows/publish-homebrew.yml

@@ -19,4 +19,4 @@ jobs:
       - name: print sha256
         run: cat sha256.txt
       - name: publish homebrew formula
-        run: ./.github/scripts/homebrew/publish.sh -u mxcd -t ${{ secrets.CI_PAT }} -v ${{ github.ref_name }} -s $(cat sha256.txt)
+        run: ./hack/homebrew/publish.sh -u mxcd -t ${{ secrets.CI_PAT }} -v ${{ github.ref_name }} -s $(cat sha256.txt)

.github/workflows/build.yml .github/workflows/release.yml.github/workflows/build.yml renamed to .github/workflows/release.yml

@@ -1,12 +1,12 @@
-name: Build
+name: Release
 
 on:
   push:
     tags:
       - 2.*
 
 jobs:
-  test:
+  binaries:
     name: Build
     strategy:
       fail-fast: false
@@ -42,3 +42,26 @@ jobs:
           file: ${{ github.workspace }}/cmd/gitops/gitops${{ matrix.artifact_suffix }}
           asset_name: gitops_${{ matrix.os_name }}_${{ matrix.arch }}${{ matrix.artifact_suffix }}
           tag: ${{ github.ref }}
+  docker:
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [gitops, repo-server]
+    name: docker build
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build
+        id: docker_build
+        uses: docker/build-push-action@v4
+        with:
+          platforms: linux/amd64
+          push: true
+          tags: ghcr.io/mxcd/gitops/${{ matrix.image }}:${{ github.ref_name }}
+          file: docker/${{ matrix.image }}/Dockerfile

docker/repo-server/Dockerfile

@@ -1,29 +1,5 @@
-FROM golang:1.24-alpine AS builder
-
-RUN apk add --no-cache \
-  build-base \
-  cmake \
-  openssl-dev \
-  libssh2-dev \
-  zlib-dev \
-  curl \
-  git
-
-WORKDIR /tmp
-RUN curl -L https://github.com/libgit2/libgit2/archive/refs/tags/v1.5.0.tar.gz | tar xz && \
-    cd libgit2-1.5.0 && \
-    cmake . -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr && \
-    cmake --build . --target install
-
-WORKDIR /go/src/github.com/libgit2
-RUN git clone https://github.com/libgit2/git2go.git && \
-    cd git2go && \
-    git checkout v34.0.0 && \
-    git submodule update --init
-
-ENV CGO_CFLAGS="-I/usr/include"
-ENV CGO_LDFLAGS="-L/usr/lib -lz -lssl -lcrypto"
-ENV LD_LIBRARY_PATH="/usr/lib"
+FROM golang:1.24-alpine3.20 AS builder
+RUN apk add --no-cache git
 
 WORKDIR /usr/src
 COPY go.mod /usr/src/go.mod
@@ -34,10 +10,10 @@ COPY cmd cmd
 COPY internal internal
 
 WORKDIR /usr/src/cmd/repo-server
-RUN go build -o repo-server -ldflags="-s -w" .
+RUN go build -o server -ldflags="-s -w" .
 
-FROM alpine:3.21
+FROM alpine:3.20
 WORKDIR /usr/bin
-COPY --from=builder /usr/src/cmd/repo-server/repo-server .
-ENTRYPOINT ["/usr/bin/repo-server"]
+COPY --from=builder /usr/src/cmd/repo-server/server .
+ENTRYPOINT ["/usr/bin/server"]
 EXPOSE 8080