Merge pull request #85 from RoboCup-SSL/pipeline

Update build and release pipeline

Author: g3force

.circleci/config.yml

@@ -1,4 +1,9 @@
 version: 2.1
+parameters:
+  cmds:
+    type: string
+    default: "ssl-game-controller ssl-ref-client"
+
 jobs:
   build_node:
     resource_class: medium
@@ -46,7 +51,7 @@ jobs:
       - run: |
           set -u
           version=${CIRCLE_TAG:-}
-          for cmd in ssl-game-controller ssl-ref-client; do
+          for cmd in ${cmds}; do
             GOOS=linux GOARCH=amd64 go build -o ./release/${cmd}_${version}_linux_amd64 ./cmd/${cmd}
             GOOS=linux GOARCH=arm64 go build -o ./release/${cmd}_${version}_linux_arm64 ./cmd/${cmd}
             GOOS=linux GOARCH=arm go build -o ./release/${cmd}_${version}_linux_arm ./cmd/${cmd}
@@ -69,9 +74,9 @@ jobs:
       - run: |
           set -u
           go install github.com/tcnksm/[email protected]
-          ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./release
+          ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete -generatenotes ${CIRCLE_TAG} ./release
 
-  docker:
+  build_docker:
     resource_class: small
     docker:
       - image: cimg/base:2023.04
@@ -80,11 +85,27 @@ jobs:
       - setup_remote_docker:
           version: 20.10.18
       - run: |
-          TAG=${CIRCLE_TAG:-1}
+          for cmd in ${cmds}; do
+            docker build -f ./cmd/${cmd}/Dockerfile -t robocupssl/${cmd}:latest .
+          done
+
+  publish_docker:
+    resource_class: small
+    docker:
+      - image: cimg/base:2023.04
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 20.10.18
+      - run: |
+          # Parse version from tag (removing 'v' prefix)
+          TAG=${CIRCLE_TAG:1}
           TAG=${TAG:-latest}
-          docker build -t robocupssl/ssl-game-controller:$TAG .
-          docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"
-          docker push robocupssl/ssl-game-controller:$TAG
+          for cmd in ${cmds}; do
+            docker build -f ./cmd/${cmd}/Dockerfile -t robocupssl/${cmd}:${TAG} .
+            docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"
+            docker push robocupssl/${cmd}:${TAG}
+          done
 
 workflows:
   version: 2
@@ -106,6 +127,7 @@ workflows:
           filters: { branches: { ignore: /.*/ }, tags: { only: /^v.*/ } }
   docker:
     jobs:
-      - docker:
+      - build_docker
+      - publish_docker:
           context: docker hub
           filters: { branches: { only: master }, tags: { only: /^v.*/ } }

.dockerignore

@@ -1,14 +1,10 @@
-.circleci
-.idea
-.vscode
-.local
-/config
-/doc
-node_modules
-/proto
-.git
-/Dockerfile
-/.env
-/docker-compose.yaml
-/state-store.json.stream
-dist
+*
+!cmd
+!frontend
+!internal
+!pkg
+!go.mod
+!go.sum
+
+frontend/node_modules
+frontend/dist

.editorconfig

@@ -17,3 +17,6 @@ indent_size = 4
 [*.{yaml,json}]
 indent_style = space
 indent_size = 2
+
+[Makefile]
+indent_style = tab

.github/release.yml

@@ -0,0 +1,11 @@
+changelog:
+  categories:
+    - title: 🏕 Features
+      labels:
+        - '*'
+      exclude:
+        labels:
+          - dependencies
+    - title: 👒 Dependencies
+      labels:
+        - dependencies

.github/renovate.json

@@ -2,5 +2,8 @@
   "extends": [
     "config:base",
     "schedule:monthly"
+  ],
+  "labels": [
+    "dependencies"
   ]
 }

.gitignore

@@ -26,3 +26,6 @@ yarn-error.log*
 
 # Local installations
 /.local
+
+# Make cache
+/.frontend

Makefile

@@ -0,0 +1,28 @@
+.PHONY: all ssl-game-controller-docker ssl-ref-client-docker docker frontend test install proto
+
+all: install docker
+
+docker-ssl-game-controller:
+	docker build -f ./cmd/ssl-game-controller/Dockerfile -t ssl-game-controller:latest .
+
+docker-ssl-ref-client:
+	docker build -f ./cmd/ssl-ref-client/Dockerfile -t ssl-ref-client:latest .
+
+docker: docker-ssl-game-controller docker-ssl-ref-client
+
+.frontend: $(shell find frontend/ -type f)
+	cd frontend && \
+	npm install && \
+	npm run build && \
+	touch ../.frontend
+
+frontend: .frontend
+
+test: frontend
+	go test ./...
+
+install: frontend
+	go install -v ./...
+
+proto:
+	tools/generateProto.sh

README.md

@@ -149,7 +149,7 @@ go run cmd/ssl-game-controller/main.go
 ### Build self-contained release binary
 
 ```bash
-./install.sh
+make install
 ```
 
 ### Test with autoRefs

Dockerfile cmd/ssl-game-controller/DockerfileDockerfile renamed to cmd/ssl-game-controller/Dockerfile

@@ -6,12 +6,7 @@ RUN npm run build
 
 FROM golang:1.20-alpine AS build_go
 WORKDIR /go/src/github.com/RoboCup-SSL/ssl-game-controller
-COPY cmd cmd
-COPY internal internal
-COPY pkg pkg
-COPY frontend frontend
-COPY go.mod .
-COPY go.sum .
+COPY . .
 COPY --from=build_node /tmp/ssl-game-controller/frontend/dist frontend/dist
 RUN go install -v ./cmd/ssl-game-controller
 
@@ -20,6 +15,5 @@ FROM alpine:3
 COPY --from=build_go /go/bin/ssl-game-controller /app/ssl-game-controller
 RUN mkdir -p config && chown -R 1000: config
 USER 1000
-EXPOSE 8081 10007 10008 10009 10011 10107 10108 10111
 ENTRYPOINT ["/app/ssl-game-controller"]
 CMD []

cmd/ssl-ref-client/Dockerfile

@@ -0,0 +1,11 @@
+FROM golang:1.20-alpine AS build_go
+WORKDIR /go/src/github.com/RoboCup-SSL/ssl-game-controller
+COPY . .
+RUN go install -v ./cmd/ssl-ref-client
+
+# Start fresh from a smaller image
+FROM alpine:3
+COPY --from=build_go /go/bin/ssl-ref-client /app/ssl-ref-client
+USER 1000
+ENTRYPOINT ["/app/ssl-ref-client"]
+CMD []