From bd9234572ae620d18d08abd93683c23339fbad52 Mon Sep 17 00:00:00 2001 From: Prad N Date: Sat, 11 Jan 2025 12:24:55 -0500 Subject: [PATCH] ci: improve CI/CD process with devbox integration --- .github/deploy/Caddyfile | 0 .github/deploy/{scripts => }/bootstrap.sh | 0 .github/deploy/devbox.json | 6 ++---- Makefile | 10 +++++++++- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 .github/deploy/Caddyfile rename .github/deploy/{scripts => }/bootstrap.sh (100%) diff --git a/.github/deploy/Caddyfile b/.github/deploy/Caddyfile new file mode 100644 index 000000000..e69de29bb diff --git a/.github/deploy/scripts/bootstrap.sh b/.github/deploy/bootstrap.sh similarity index 100% rename from .github/deploy/scripts/bootstrap.sh rename to .github/deploy/bootstrap.sh diff --git a/.github/deploy/devbox.json b/.github/deploy/devbox.json index bb011cf8e..2d3f77250 100644 --- a/.github/deploy/devbox.json +++ b/.github/deploy/devbox.json @@ -6,16 +6,14 @@ "uv@latest", "bun@latest", "yarn@latest", - "doppler@latest", - "go-task@latest" + "doppler@latest" ], "env": { "PATH": "$HOME/.cargo/bin:$HOME/go/bin:$HOME/.local/bin:$HOME/.bun/bin:$PATH", "GITHUB_TOKEN": "$GITHUB_TOKEN", "GOPATH": "$HOME/go", "GOBIN": "$GOPATH/bin", - "GHQ_ROOT": "$CLONEDIR", - "PC_SOCK": "$HOME/.local/share/pc/sock" + "GHQ_ROOT": "$CLONEDIR" }, "shell": { "init_hook": [], diff --git a/Makefile b/Makefile index fc5248b84..4a18c8ca7 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,6 @@ release: fmt-date @go install github.com/goreleaser/goreleaser/v2@latest RELEASE_DATE=$(RELEASE_DATE) goreleaser release --clean - ######################################## ### Tools & dependencies ######################################## @@ -344,6 +343,15 @@ release-check: validate-tag: @sh ./scripts/validate_tag.sh + +deploy-up: + @echo "Starting deployment" + cd .github/deploy && devbox run up + +deploy-down: + @echo "Stopping deployment" + cd .github/deploy && devbox run down + ############################################################################### ### help ### ###############################################################################