Add Makefile, update github actions, fix build cache

Author: jshufro

.github/workflows/build.yml

@@ -17,5 +17,4 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: 1.21.8
-      - run: cd ${GITHUB_WORKSPACE}/rocketpool-cli && go build .
-      - run: cd ${GITHUB_WORKSPACE}/rocketpool && go build .
+      - run: make rocketpool-cli rocketpool-daemon

.github/workflows/lint.yml

@@ -34,7 +34,7 @@ jobs:
           # args: --issues-exit-code=0
 
           # For now, Smart Node will only enforce goimports linting
-          args: --disable-all --enable goimports
+          args: --disable-all --enable goimports addons/... shared/... rocketpool/... rocketpool-cli/...
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true

.github/workflows/unit-tests.yml

@@ -17,4 +17,4 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: 1.21.8
-      - run: go test ./... -timeout 30m
+      - run: make test

Makefile

@@ -0,0 +1,50 @@
+BUILD_DIR=build
+CLI_DIR=${BUILD_DIR}/cli
+DAEMON_DIR=${BUILD_DIR}/daemon
+
+CLI_TARGET_OOS:=linux darwin
+ARCHS:=arm64 amd64
+
+CLI_TARGET_STRINGS:=$(foreach oos,$(CLI_TARGET_OOS), $(foreach arch,$(ARCHS),${CLI_DIR}/rocketpool-cli-$(oos)-$(arch)))
+DAEMON_TARGET_STRINGS:=$(foreach arch,$(ARCHS),${DAEMON_DIR}/rocketpool-daemon-linux-$(arch))
+
+MODULES:=$(foreach path,$(shell find . -name go.mod),$(dir $(path)))
+MODULE_GLOBS:=$(foreach module,$(MODULES),$(module)...)
+
+define rocketpool-cli-template
+.PHONY: ${CLI_DIR}/rocketpool-cli-$1-$2
+${CLI_DIR}/rocketpool-cli-$1-$2: ${CLI_DIR}
+	@echo "Building rocketpool-cli-$1-$2"
+	CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -o $$@ ./rocketpool-cli/rocketpool-cli.go
+endef
+
+.PHONY: all
+all: lint rocketpool-cli rocketpool-daemon
+
+.PHONY: rocketpool-cli
+rocketpool-cli: $(CLI_TARGET_STRINGS)
+
+.PHONY: rocketpool-daemon
+rocketpool-daemon: ${DAEMON_DIR}
+	docker build -t rocketpool/smartnode-builder:latest -f docker/smartnode-builder .
+	docker run --env OWNER=$(shell id -u):$(shell id -g) --rm -v $(PWD):/src -v $(PWD)/${DAEMON_DIR}:/out -v /tmp/docker-go-build:/root/.cache/go-build rocketpool/smartnode-builder:latest /src/rocketpool/build.sh
+
+${CLI_DIR}:
+	mkdir -p ${CLI_DIR}
+${DAEMON_DIR}:
+	mkdir -p ${DAEMON_DIR}
+
+$(foreach oos,$(CLI_TARGET_OOS),$(foreach arch,$(ARCHS),$(eval $(call rocketpool-cli-template,$(oos),$(arch)))))
+
+.PHONY: clean
+clean:
+	rm -rf build
+
+.PHONY: lint
+lint:
+	@echo $(MODULE_GLOBS)
+	golangci-lint run --disable-all --enable goimports $(MODULE_GLOBS) 
+
+.PHONY: test
+test:
+	go test $(MODULE_GLOBS)

daemon-build.sh

@@ -3,7 +3,7 @@
 # Get the platform type and run the build script if possible
 PLATFORM=$(uname -s)
 if [ "$PLATFORM" = "Linux" ]; then
-    docker run --rm -v $PWD:/smartnode rocketpool/smartnode-builder:latest /smartnode/rocketpool/build.sh
+    docker run --rm -v $PWD:/src rocketpool/smartnode-builder:latest /smartnode/rocketpool/build.sh
 else
     echo "Platform ${PLATFORM} is not supported by this script, please build the daemon manually."
     exit 1

docker/rocketpool-dockerfile

@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 ARG TARGETARCH
-COPY ./rocketpool/rocketpool-daemon-linux-${TARGETARCH} /go/bin/rocketpool
+COPY ./build/daemon/rocketpool-daemon-linux-${TARGETARCH} /go/bin/rocketpool
 
 RUN apt update && apt install ca-certificates -y
 

docker/smartnode-builder

@@ -12,8 +12,13 @@ RUN apt update && apt install -y \
 	wget
 
 # Cache go dependencies
-COPY . /src
+COPY ./go.work /src/go.work
+COPY ./go.work.sum /src/go.work.sum
+COPY ./addons/go.mod /src/addons/go.mod
+COPY ./rocketpool/go.mod /src/rocketpool/go.mod
+COPY ./rocketpool-cli/go.mod /src/rocketpool-cli/go.mod
+COPY ./shared/go.mod /src/shared/go.mod
 WORKDIR /src
-RUN go work sync
+RUN go mod download -x
 WORKDIR /
 RUN rm -rf /src

go.work.sum

@@ -1,10 +1,17 @@
 #!/bin/bash
+set -x
 
 export CGO_ENABLED=1
-cd /smartnode/rocketpool
+cd $(dirname "$0") 
 
 # Build x64 version
-CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=amd64 GOOS=linux go build -o rocketpool-daemon-linux-amd64 rocketpool.go
+CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=amd64 GOOS=linux go build -o /out/rocketpool-daemon-linux-amd64 rocketpool.go
 
 # Build the arm64 version
-CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-cpp CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=arm64 GOOS=linux go build -o rocketpool-daemon-linux-arm64 rocketpool.go
+CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-cpp CGO_CFLAGS="-O -D__BLST_PORTABLE__" GOARCH=arm64 GOOS=linux go build -o /out/rocketpool-daemon-linux-arm64 rocketpool.go
+
+if [ -z "${OWNER}" ]; then
+	exit 0
+fi
+
+chown ${OWNER} /out/*