From f8880560b15f195729d6ef6d95ca3a73ceb17d8b Mon Sep 17 00:00:00 2001
From: Henry Dollman <hank@henrygd.me>
Date: Sun, 21 Jul 2024 18:38:51 -0400
Subject: [PATCH] update workflows

---
 .github/workflows/docker-image.yml      | 63 -------------------------
 .github/workflows/goreleaser-action.yml | 18 +++++--
 2 files changed, 15 insertions(+), 66 deletions(-)
 delete mode 100644 .github/workflows/docker-image.yml

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
deleted file mode 100644
index c78163c..0000000
--- a/.github/workflows/docker-image.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-name: Make Docker Images
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - image: henrygd/beszel
-            context: hub
-          - image: henrygd/beszel-agent
-            context: agent
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker metadata
-        id: metadata
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ matrix.image }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=raw,value={{sha}},enable=${{ github.ref_type != 'tag' }}
-
-      # https://github.com/docker/login-action
-      - name: Login to Docker Hub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: '{{defaultContext}}:${{ matrix.context }}'
-          file: ${{ matrix.dockerfile }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref_type == 'tag' }}
-          tags: ${{ steps.metadata.outputs.tags }}
-          labels: ${{ steps.metadata.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha
diff --git a/.github/workflows/goreleaser-action.yml b/.github/workflows/goreleaser-action.yml
index 7e1ede7..1cd6a10 100644
--- a/.github/workflows/goreleaser-action.yml
+++ b/.github/workflows/goreleaser-action.yml
@@ -1,4 +1,4 @@
-name: goreleaser
+name: Make release and binaries
 
 on:
   push:
@@ -16,23 +16,35 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
+      - name: Set up bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install dependencies
+        run: bun install --cwd ./hub/site
+
+      - name: Build site
+        run: bun run --cwd ./hub/site build
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version: '^1.22.1'
+
       - name: GoReleaser beszel
         uses: goreleaser/goreleaser-action@v6
         with:
-          workdir: ./beszel
+          workdir: ./hub
           distribution: goreleaser
           version: latest
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.TOKEN }}
+
       - name: GoReleaser beszel-agent
         uses: goreleaser/goreleaser-action@v6
         with:
-          workdir: ./beszel-agent
+          workdir: ./agent
           distribution: goreleaser
           version: latest
           args: release --clean