Compare commits

...

4 Commits

Author SHA1 Message Date
Henry Dollman
bb295ca297 0.0.1-alpha.2 2024-07-21 19:20:42 -04:00
Henry Dollman
765a4c707b update the update scripts 2024-07-21 19:20:20 -04:00
Henry Dollman
683032f919 add action for docker images 2024-07-21 19:19:58 -04:00
Henry Dollman
f8880560b1 update workflows 2024-07-21 18:38:51 -04:00
7 changed files with 32 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
name: Make Docker Images name: Make docker images
on: on:
push: push:
@@ -24,6 +24,15 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- 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 QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3

View File

@@ -1,4 +1,4 @@
name: goreleaser name: Make release and binaries
on: on:
push: push:
@@ -16,23 +16,35 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 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 - name: Set up Go
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: '^1.22.1' go-version: '^1.22.1'
- name: GoReleaser beszel - name: GoReleaser beszel
uses: goreleaser/goreleaser-action@v6 uses: goreleaser/goreleaser-action@v6
with: with:
workdir: ./beszel workdir: ./hub
distribution: goreleaser distribution: goreleaser
version: latest version: latest
args: release --clean args: release --clean
env: env:
GITHUB_TOKEN: ${{ secrets.TOKEN }} GITHUB_TOKEN: ${{ secrets.TOKEN }}
- name: GoReleaser beszel-agent - name: GoReleaser beszel-agent
uses: goreleaser/goreleaser-action@v6 uses: goreleaser/goreleaser-action@v6
with: with:
workdir: ./beszel-agent workdir: ./agent
distribution: goreleaser distribution: goreleaser
version: latest version: latest
args: release --clean args: release --clean

View File

@@ -23,7 +23,7 @@ import (
psutilNet "github.com/shirou/gopsutil/v4/net" psutilNet "github.com/shirou/gopsutil/v4/net"
) )
var Version = "0.0.1-alpha.0" var Version = "0.0.1-alpha.2"
var containerCpuMap = make(map[string][2]uint64) var containerCpuMap = make(map[string][2]uint64)
var containerCpuMutex = &sync.Mutex{} var containerCpuMutex = &sync.Mutex{}

View File

@@ -2,7 +2,6 @@ package main
import ( import (
"fmt" "fmt"
"log"
"os" "os"
"strings" "strings"
@@ -37,7 +36,7 @@ func updateBeszel() {
} }
var binaryPath string var binaryPath string
fmt.Printf("Updating from %s to %s...", currentVersion, latest.Version) fmt.Printf("Updating from %s to %s...\n", currentVersion, latest.Version)
binaryPath, err = os.Executable() binaryPath, err = os.Executable()
if err != nil { if err != nil {
fmt.Println("Error getting binary path:", err) fmt.Println("Error getting binary path:", err)
@@ -48,5 +47,5 @@ func updateBeszel() {
fmt.Println("Please try rerunning with sudo. Error:", err) fmt.Println("Please try rerunning with sudo. Error:", err)
os.Exit(1) os.Exit(1)
} }
log.Printf("Successfully updated: %s -> %s\n\n%s", currentVersion, latest.Version, strings.TrimSpace(latest.ReleaseNotes)) fmt.Printf("Successfully updated to %s\n\n%s\n", latest.Version, strings.TrimSpace(latest.ReleaseNotes))
} }

View File

@@ -31,7 +31,7 @@ import (
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
var Version = "0.0.1-alpha.0" var Version = "0.0.1-alpha.2"
var app *pocketbase.PocketBase var app *pocketbase.PocketBase
var serverConnections = make(map[string]Server) var serverConnections = make(map[string]Server)

View File

@@ -281,7 +281,7 @@ export function UserAuthForm({
<Dialog> <Dialog>
<DialogTrigger asChild> <DialogTrigger asChild>
<button type="button" className={cn(buttonVariants({ variant: 'outline' }))}> <button type="button" className={cn(buttonVariants({ variant: 'outline' }))}>
<img className="mr-2 h-4 w-4 dark:invert" src="/icons/github.svg" alt="" /> <img className="mr-2 h-4 w-4 dark:invert" src="/static/github.svg" alt="" />
<span className="translate-y-[1px]">GitHub</span> <span className="translate-y-[1px]">GitHub</span>
</button> </button>
</DialogTrigger> </DialogTrigger>

View File

@@ -2,7 +2,6 @@ package main
import ( import (
"fmt" "fmt"
"log"
"os" "os"
"strings" "strings"
@@ -38,7 +37,7 @@ func updateBeszel(cmd *cobra.Command, args []string) {
} }
var binaryPath string var binaryPath string
fmt.Printf("Updating from %s to %s...", currentVersion, latest.Version) fmt.Printf("Updating from %s to %s...\n", currentVersion, latest.Version)
binaryPath, err = os.Executable() binaryPath, err = os.Executable()
if err != nil { if err != nil {
fmt.Println("Error getting binary path:", err) fmt.Println("Error getting binary path:", err)
@@ -49,5 +48,5 @@ func updateBeszel(cmd *cobra.Command, args []string) {
fmt.Println("Please try rerunning with sudo. Error:", err) fmt.Println("Please try rerunning with sudo. Error:", err)
os.Exit(1) os.Exit(1)
} }
log.Printf("Successfully updated: %s -> %s\n\n%s", currentVersion, latest.Version, strings.TrimSpace(latest.ReleaseNotes)) fmt.Printf("Successfully updated to %s\n\n%s\n", latest.Version, strings.TrimSpace(latest.ReleaseNotes))
} }