mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-11-10 00:43:15 -06:00
Compare commits
1 commit
95281a7753
...
b832fffc38
| Author | SHA1 | Date | |
|---|---|---|---|
|
b832fffc38 |
18 changed files with 132 additions and 333 deletions
|
|
@ -1,4 +1,4 @@
|
|||
name: Flake Update / Build
|
||||
name: Build NixOS (Nightly)
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
|
@ -101,11 +101,8 @@ jobs:
|
|||
|
||||
- run: |
|
||||
echo "# System Diff" >> $GITHUB_STEP_SUMMARY
|
||||
diff=$(nix store diff-closures ./current ./updated)
|
||||
echo "$diff"
|
||||
echo "$diff" >> summary.md
|
||||
echo "$diff" | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g' >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
# TODO: deal with store diff-closures ansi outputs...
|
||||
nix store diff-closures ./current ./updated | tee -a $GITHUB_STEP_SUMMARY summary.md
|
||||
- run: df -h
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
|
|
@ -52,14 +52,15 @@ Usage:
|
|||
oizys [command]
|
||||
|
||||
Available Commands:
|
||||
boot nixos rebuild boot
|
||||
build nix build
|
||||
cache build and push to cachix
|
||||
checks nix build checks
|
||||
ci offload build to GHA
|
||||
dry poor man's nix flake check
|
||||
help Help about any command
|
||||
os nixos-rebuild wrapper
|
||||
output show nixosConfiguration attr
|
||||
switch nixos rebuild switch
|
||||
update update and run nixos rebuild
|
||||
|
||||
Flags:
|
||||
|
|
@ -83,4 +84,3 @@ Oizys was birthed by the goddess Nyx/Nix and embodies suffering and misery. Whic
|
|||
> I don't use home-manager to manager my shell/user configs. You can find those in my separate `chezmoi`-managed [`dotfiles`](https://git.dayl.in/daylin/dotfiles) repository.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
20
flake.lock
20
flake.lock
|
|
@ -305,11 +305,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721157817,
|
||||
"narHash": "sha256-G93msn9eSKDjkWJlualhXvrOsEL6gQN3hjDEll+H8VE=",
|
||||
"lastModified": 1721044084,
|
||||
"narHash": "sha256-vO6wBIaInnyIQqmsKc28AsFSWeCFgnFilNhv2zoN/tU=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "da956c8a979471282db6790f5fa5dcec320ec226",
|
||||
"revCount": 4928,
|
||||
"rev": "bd526822deb9ed47c0b51b534817aa8541fff07b",
|
||||
"revCount": 4927,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -426,11 +426,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721071737,
|
||||
"narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=",
|
||||
"lastModified": 1720545076,
|
||||
"narHash": "sha256-Pxacc2uoxI00koXp5+CyNqHOTQlqNlK0rlRHDBHX4+g=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f",
|
||||
"rev": "6174a2a25f4e216c0f1d0c4278adc23c476b1d09",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -694,11 +694,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1720957393,
|
||||
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
|
||||
"lastModified": 1720542800,
|
||||
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
|
||||
"rev": "feb2849fdeb70028c70d73b848214b00d324a497",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
19
pkgs/oizys/cmd/boot.go
Normal file
19
pkgs/oizys/cmd/boot.go
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
package cmd
|
||||
|
||||
import (
|
||||
"oizys/internal/oizys"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var bootCmd = &cobra.Command{
|
||||
Use: "boot",
|
||||
Short: "nixos rebuild boot",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
oizys.NixosRebuild("boot", args...)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(bootCmd)
|
||||
}
|
||||
|
|
@ -10,11 +10,12 @@ var buildCmd = &cobra.Command{
|
|||
Use: "build",
|
||||
Short: "nix build",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
oizys.NixBuild(minimal, args...)
|
||||
oizys.NixBuild(nom, minimal, args...)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(buildCmd)
|
||||
buildCmd.Flags().BoolVar(&nom, "nom", false, "display result with nom")
|
||||
buildCmd.Flags().BoolVar(&minimal, "minimal", false, "use system dry-run to make build args")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,11 @@ var checksCmd = &cobra.Command{
|
|||
Use: "checks",
|
||||
Short: "nix build checks",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
oizys.Checks(args...)
|
||||
oizys.Checks(nom, args...)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(checksCmd)
|
||||
checksCmd.Flags().BoolVar(&nom, "nom", false, "display result with nom")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"oizys/internal/oizys"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var validArgs = []string{
|
||||
"switch", "boot", "test", "build", "dry-build", "dry-activate", "edit", "repl",
|
||||
"build-vm", "build-vm-with-bootloader",
|
||||
"list-generations",
|
||||
}
|
||||
var osCmd = &cobra.Command{
|
||||
Use: "os [subcmd]",
|
||||
Short: "nixos-rebuild wrapper",
|
||||
Args: func(cmd *cobra.Command, args []string) error {
|
||||
if err := cobra.MinimumNArgs(1)(cmd, args); err != nil {
|
||||
return err
|
||||
}
|
||||
// Run the custom validation logic
|
||||
if slices.Contains(validArgs, args[0]) {
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("unexpected arg: %s\nexpected one of:\n %s", args[0], strings.Join(validArgs, ", "))
|
||||
},
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
subcmd := args[0]
|
||||
oizys.NixosRebuild(subcmd, args[1:]...)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(osCmd)
|
||||
}
|
||||
|
|
@ -33,6 +33,7 @@ var (
|
|||
host string
|
||||
debug bool
|
||||
verbose bool
|
||||
nom bool
|
||||
systemPath bool
|
||||
resetCache bool
|
||||
minimal bool
|
||||
|
|
|
|||
19
pkgs/oizys/cmd/switch.go
Normal file
19
pkgs/oizys/cmd/switch.go
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
package cmd
|
||||
|
||||
import (
|
||||
"oizys/internal/oizys"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var switchCmd = &cobra.Command{
|
||||
Use: "switch",
|
||||
Short: "nixos rebuild switch",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
oizys.NixosRebuild("switch", args...)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(switchCmd)
|
||||
}
|
||||
|
|
@ -1,13 +1,8 @@
|
|||
package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"oizys/internal/github"
|
||||
"oizys/internal/oizys"
|
||||
"oizys/internal/ui"
|
||||
"os"
|
||||
|
||||
"github.com/charmbracelet/log"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
@ -15,25 +10,14 @@ var updateCmd = &cobra.Command{
|
|||
Use: "update",
|
||||
Short: "update and run nixos rebuild",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
run := github.GetLastUpdateRun()
|
||||
if preview {
|
||||
md, err := github.GetUpateSummary(run.GetID())
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
fmt.Println(md)
|
||||
if !ui.Confirm("proceed with system update?") {
|
||||
os.Exit(0)
|
||||
}
|
||||
}
|
||||
oizys.UpdateRepo()
|
||||
oizys.NixosRebuild("switch")
|
||||
oizys.GitPull()
|
||||
oizys.NixosRebuild("switch", args...)
|
||||
},
|
||||
}
|
||||
|
||||
var preview bool
|
||||
var boot bool
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(updateCmd)
|
||||
updateCmd.Flags().BoolVar(&preview, "preview", false, "confirm nix store diff")
|
||||
updateCmd.Flags().BoolVarP(&boot, "boot", "b", false, "run nixos-rebuild boot")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,17 +3,19 @@
|
|||
installShellFiles,
|
||||
buildGoModule,
|
||||
makeWrapper,
|
||||
gh,
|
||||
nix-output-monitor,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) cleanSource;
|
||||
inherit (lib) cleanSource makeBinPath;
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "oizys";
|
||||
version = "unstable";
|
||||
|
||||
src = cleanSource ./.;
|
||||
vendorHash = "sha256-+4OtpcKHfomBAXRrJOvkhQdCSwU0W6+5OJuS4o12r5E=";
|
||||
vendorHash = "sha256-/JVXhXrU2np/ty7AGFy+LPZCo1NaLYl9NAyD9+FJYBI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -25,4 +27,13 @@ buildGoModule {
|
|||
--zsh <(OIZYS_SKIP_CHECK=true $out/bin/oizys completion zsh)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/oizys \
|
||||
--prefix PATH ':' ${
|
||||
makeBinPath [
|
||||
gh
|
||||
nix-output-monitor
|
||||
]
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ require (
|
|||
github.com/briandowns/spinner v1.23.0
|
||||
github.com/charmbracelet/lipgloss v0.11.0
|
||||
github.com/charmbracelet/log v0.4.0
|
||||
github.com/google/go-github/v63 v63.0.0
|
||||
github.com/ivanpirog/coloredcobra v1.0.1
|
||||
github.com/spf13/cobra v1.8.0
|
||||
golang.org/x/term v0.21.0
|
||||
|
|
@ -17,7 +16,6 @@ require (
|
|||
github.com/charmbracelet/x/ansi v0.1.2 // indirect
|
||||
github.com/fatih/color v1.17.0 // indirect
|
||||
github.com/go-logfmt/logfmt v0.6.0 // indirect
|
||||
github.com/google/go-querystring v1.1.0 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||
|
|
|
|||
|
|
@ -17,13 +17,6 @@ github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
|
|||
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
|
||||
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
|
||||
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
|
||||
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/go-github/v63 v63.0.0 h1:13xwK/wk9alSokujB9lJkuzdmQuVn2QCPeck76wR3nE=
|
||||
github.com/google/go-github/v63 v63.0.0/go.mod h1:IqbcrgUmIcEaioWrGYei/09o+ge5vhffGOcxrO0AfmA=
|
||||
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
|
||||
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
|
||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||
|
|
@ -67,7 +60,6 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
|||
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
|
||||
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
|
|
|
|||
|
|
@ -1,24 +1,18 @@
|
|||
package git
|
||||
package oizys
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"oizys/internal/ui"
|
||||
"os"
|
||||
"os/exec"
|
||||
|
||||
"github.com/charmbracelet/log"
|
||||
"oizys/internal/ui"
|
||||
)
|
||||
|
||||
type GitRepo struct {
|
||||
path string
|
||||
}
|
||||
|
||||
func NewRepo(path string) *GitRepo {
|
||||
repo := new(GitRepo)
|
||||
repo.path = path
|
||||
return repo
|
||||
}
|
||||
|
||||
func (g *GitRepo) git(rest ...string) *exec.Cmd {
|
||||
args := []string{"-C", g.path}
|
||||
args = append(args, rest...)
|
||||
|
|
@ -27,22 +21,8 @@ func (g *GitRepo) git(rest ...string) *exec.Cmd {
|
|||
return cmd
|
||||
}
|
||||
|
||||
func (g *GitRepo) Fetch() {
|
||||
err := g.git("fetch").Run()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func (g *GitRepo) Rebase(ref string) {
|
||||
g.Status()
|
||||
err := g.git("rebase", ref).Run()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func (g *GitRepo) Status() {
|
||||
func GitPull(workDir string) {
|
||||
g := GitRepo{workDir}
|
||||
cmdOutput, err := g.git("status", "--porcelain").Output()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
|
|
@ -53,11 +33,8 @@ func (g *GitRepo) Status() {
|
|||
ui.ShowFailedOutput(cmdOutput)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func (g *GitRepo) Pull() {
|
||||
g.Status()
|
||||
cmdOutput, err := g.git("pull").CombinedOutput()
|
||||
cmdOutput, err = g.git("pull").CombinedOutput()
|
||||
if err != nil {
|
||||
ui.ShowFailedOutput(cmdOutput)
|
||||
log.Fatal(err)
|
||||
|
|
|
|||
|
|
@ -1,154 +0,0 @@
|
|||
package github
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"oizys/internal/oizys"
|
||||
|
||||
"github.com/charmbracelet/log"
|
||||
"github.com/google/go-github/v63/github"
|
||||
)
|
||||
|
||||
var client *github.Client
|
||||
|
||||
func init() {
|
||||
client = github.NewClient(nil).WithAuthToken(oizys.GithubToken())
|
||||
}
|
||||
|
||||
func ListWorkflows() {
|
||||
workflowRuns, resp, err := client.Actions.ListWorkflowRunsByFileName(
|
||||
context.Background(),
|
||||
"daylinmorgan",
|
||||
"oizys",
|
||||
"update.yml",
|
||||
nil,
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal("Failed to get a list of workflows", "err", err, "resp", resp)
|
||||
}
|
||||
for _, w := range workflowRuns.WorkflowRuns {
|
||||
fmt.Println(w.GetID())
|
||||
fmt.Println(w.GetConclusion())
|
||||
}
|
||||
}
|
||||
|
||||
func ListUpdateRuns() (*github.WorkflowRuns, *github.Response) {
|
||||
workflowRuns, resp, err := client.Actions.ListWorkflowRunsByFileName(
|
||||
context.Background(),
|
||||
"daylinmorgan",
|
||||
"oizys",
|
||||
"update.yml",
|
||||
nil,
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal("failed to get last update run", "resp", resp, "err", err)
|
||||
}
|
||||
|
||||
return workflowRuns, resp
|
||||
}
|
||||
|
||||
func GetArtifacts(runID int64) (*github.ArtifactList, *github.Response) {
|
||||
artifactList, resp, err := client.Actions.ListWorkflowRunArtifacts(context.Background(), "daylinmorgan", "oizys", runID, nil)
|
||||
if err != nil {
|
||||
log.Fatal("failed to get artifacts for run", "id", runID, "err", err)
|
||||
}
|
||||
return artifactList, resp
|
||||
}
|
||||
|
||||
func GetUpdateSummaryArtifact(runID int64) *github.Artifact {
|
||||
artifactList, _ := GetArtifacts(runID)
|
||||
for _, artifact := range artifactList.Artifacts {
|
||||
if artifact.GetName() == "summary" {
|
||||
return artifact
|
||||
}
|
||||
}
|
||||
log.Fatal("failed to find summary for run", "id", runID)
|
||||
return nil
|
||||
}
|
||||
|
||||
func GetUpdateSummaryUrl(runID int64) *url.URL {
|
||||
artifact := GetUpdateSummaryArtifact(runID)
|
||||
url, resp, err := client.Actions.DownloadArtifact(context.Background(), "daylinmorgan", "oizys", artifact.GetID(), 4)
|
||||
if err != nil {
|
||||
log.Fatal("failed to get update summary URL", "artifact", artifact.GetID(), "resp", resp)
|
||||
}
|
||||
return url
|
||||
}
|
||||
|
||||
func GetUpdateSummaryFromUrl(url *url.URL) []byte {
|
||||
log.Debug(url.String())
|
||||
res, err := http.Get(url.String())
|
||||
if err != nil {
|
||||
log.Fatal("failed to get update summary zip", "err", err)
|
||||
}
|
||||
body, err := io.ReadAll(res.Body)
|
||||
res.Body.Close()
|
||||
if res.StatusCode > 299 {
|
||||
log.Fatalf("Response failed with status code: %d and\nbody: %s\n", res.StatusCode, body)
|
||||
}
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
return body
|
||||
}
|
||||
|
||||
func GetLastUpdateRun() *github.WorkflowRun {
|
||||
workflowRuns, _ := ListUpdateRuns()
|
||||
run := workflowRuns.WorkflowRuns[0]
|
||||
if run.GetConclusion() == "failure" {
|
||||
log.Fatal("Most recent run was not successful", "runId", run.GetID(), "conclusion", run.GetConclusion())
|
||||
}
|
||||
if run.GetStatus() == "in_progress" {
|
||||
log.Fatalf("Most recent run is not finished\nview workflow run at: %s", run.GetHTMLURL())
|
||||
}
|
||||
return run
|
||||
}
|
||||
|
||||
func GetUpateSummary(runID int64) (string, error) {
|
||||
url := GetUpdateSummaryUrl(runID)
|
||||
bytes := GetUpdateSummaryFromUrl(url)
|
||||
md, err := ReadMarkdownFromZip(bytes, "summary.md")
|
||||
return md, err
|
||||
}
|
||||
|
||||
func ReadMarkdownFromZip(zipData []byte, fileName string) (string, error) {
|
||||
// Open the zip reader from the in-memory byte slice
|
||||
reader, err := zip.NewReader(bytes.NewReader(zipData), int64(len(zipData)))
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Search for the target file
|
||||
var markdownFile *zip.File
|
||||
for _, f := range reader.File {
|
||||
if f.Name == fileName {
|
||||
markdownFile = f
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if markdownFile == nil {
|
||||
return "", fmt.Errorf("file %s not found in zip archive", fileName)
|
||||
}
|
||||
|
||||
// Open the markdown file reader
|
||||
fileReader, err := markdownFile.Open()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer fileReader.Close()
|
||||
|
||||
// Read the markdown content
|
||||
content, err := io.ReadAll(fileReader)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// Return the markdown content as string
|
||||
return string(content), nil
|
||||
}
|
||||
|
|
@ -5,8 +5,6 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"oizys/internal/git"
|
||||
"oizys/internal/ui"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
|
@ -15,6 +13,7 @@ import (
|
|||
"github.com/charmbracelet/log"
|
||||
|
||||
e "oizys/internal/exec"
|
||||
"oizys/internal/ui"
|
||||
)
|
||||
|
||||
var o *Oizys
|
||||
|
|
@ -25,13 +24,10 @@ func init() {
|
|||
|
||||
// verbose vs debug?
|
||||
type Oizys struct {
|
||||
repo *git.GitRepo
|
||||
flake string
|
||||
host string
|
||||
cache string
|
||||
githubSummary string
|
||||
githubToken string
|
||||
local bool
|
||||
inCI bool
|
||||
verbose bool
|
||||
systemPath bool
|
||||
|
|
@ -56,13 +52,8 @@ func New() *Oizys {
|
|||
}
|
||||
o.githubSummary = os.Getenv("GITHUB_STEP_SUMMARY")
|
||||
o.inCI = o.githubSummary != ""
|
||||
o.githubToken = os.Getenv("GITHUB_TOKEN")
|
||||
o.repo = git.NewRepo(o.flake)
|
||||
return o
|
||||
}
|
||||
|
||||
func GithubToken() string {
|
||||
return o.githubToken
|
||||
return o
|
||||
}
|
||||
|
||||
func SetFlake(path string) {
|
||||
|
|
@ -70,15 +61,12 @@ func SetFlake(path string) {
|
|||
if path != "" {
|
||||
o.flake = path
|
||||
}
|
||||
|
||||
// check if path is local and exists
|
||||
// check local path exists
|
||||
if !strings.HasPrefix(o.flake, "github") && !strings.HasPrefix(o.flake, "git+") {
|
||||
if _, ok := os.LookupEnv("OIZYS_SKIP_CHECK"); !ok {
|
||||
if _, err := os.Stat(o.flake); errors.Is(err, fs.ErrNotExist) {
|
||||
log.Warnf("path to flake %s does not exist, using remote as fallback", o.flake)
|
||||
o.flake = "github:daylinmorgan/oizys"
|
||||
} else {
|
||||
o.local = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -139,6 +127,33 @@ func Output() {
|
|||
}
|
||||
}
|
||||
|
||||
func git(rest ...string) *exec.Cmd {
|
||||
args := []string{"-C", o.flake}
|
||||
args = append(args, rest...)
|
||||
cmd := exec.Command("git", args...)
|
||||
e.LogCmd(cmd)
|
||||
return cmd
|
||||
}
|
||||
|
||||
func GitPull() {
|
||||
cmdOutput, err := git("status", "--porcelain").Output()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
if len(cmdOutput) > 0 {
|
||||
fmt.Println("unstaged commits, cowardly exiting...")
|
||||
ui.ShowFailedOutput(cmdOutput)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
cmdOutput, err = git("pull").CombinedOutput()
|
||||
if err != nil {
|
||||
ui.ShowFailedOutput(cmdOutput)
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func parseDryRun(buf string) (*ui.Packages, *ui.Packages) {
|
||||
lines := strings.Split(strings.TrimSpace(buf), "\n")
|
||||
var parts [2][]string
|
||||
|
|
@ -245,8 +260,14 @@ func NixosRebuild(subcmd string, rest ...string) {
|
|||
e.ExitWithCommand(cmd)
|
||||
}
|
||||
|
||||
func NixBuild(minimal bool, rest ...string) {
|
||||
cmd := exec.Command("nix", "build")
|
||||
func NixBuild(nom bool, minimal bool, rest ...string) {
|
||||
var cmdName string
|
||||
if nom {
|
||||
cmdName = "nom"
|
||||
} else {
|
||||
cmdName = "nix"
|
||||
}
|
||||
cmd := exec.Command(cmdName, "build")
|
||||
if o.resetCache {
|
||||
cmd.Args = append(cmd.Args, "--narinfo-cache-negative-ttl", "0")
|
||||
}
|
||||
|
|
@ -297,10 +318,10 @@ func (o *Oizys) checkPath(name string) string {
|
|||
return fmt.Sprintf("%s#checks.x86_64-linux.%s", o.flake, name)
|
||||
}
|
||||
|
||||
func Checks(rest ...string) {
|
||||
func Checks(nom bool, rest ...string) {
|
||||
checks := o.getChecks()
|
||||
for _, check := range checks {
|
||||
NixBuild(false, o.checkPath(check))
|
||||
NixBuild(nom, false, o.checkPath(check))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -317,17 +338,8 @@ func CacheBuild(rest ...string) {
|
|||
}
|
||||
|
||||
func CI(rest ...string) {
|
||||
args := []string{
|
||||
"workflow", "run", "build.yml",
|
||||
"-F", fmt.Sprintf("hosts=%s", o.host),
|
||||
}
|
||||
args := []string{"workflow", "run", "build.yml", "-F", fmt.Sprintf("hosts=%s", o.host)}
|
||||
args = append(args, rest...)
|
||||
cmd := exec.Command("gh", args...)
|
||||
e.ExitWithCommand(cmd)
|
||||
}
|
||||
|
||||
func UpdateRepo() {
|
||||
log.Info("rebasing HEAD on origin/flake-lock")
|
||||
o.repo.Fetch()
|
||||
o.repo.Rebase("origin/flake-lock")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@ import (
|
|||
"os/exec"
|
||||
"strings"
|
||||
|
||||
e "oizys/internal/exec"
|
||||
|
||||
"github.com/charmbracelet/log"
|
||||
e "oizys/internal/exec"
|
||||
)
|
||||
|
||||
var ignoredMap = stringSliceToMap(
|
||||
|
|
@ -17,12 +16,16 @@ var ignoredMap = stringSliceToMap(
|
|||
// nix
|
||||
"ld-library-path", "builder.pl", "profile", "system-path",
|
||||
// nixos
|
||||
"nixos-help",
|
||||
"nixos-install", "nixos-version",
|
||||
"nixos-manual-html", "nixos-rebuild",
|
||||
"nixos-install",
|
||||
"nixos-version",
|
||||
"nixos-manual-html",
|
||||
"nixos-configuration-reference-manpage",
|
||||
"nixos-generate-config", "nixos-enter",
|
||||
"nixos-container", "nixos-build-vms",
|
||||
"nixos-rebuild",
|
||||
"nixos-help",
|
||||
"nixos-generate-config",
|
||||
"nixos-enter",
|
||||
"nixos-container",
|
||||
"nixos-build-vms",
|
||||
"nixos-wsl-version", "nixos-wsl-welcome-message", "nixos-wsl-welcome",
|
||||
// trivial packages
|
||||
"restic-gdrive", "gitea", "lock", "code",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package ui
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"os"
|
||||
"sort"
|
||||
|
|
@ -102,26 +101,3 @@ func (p *Packages) summary() {
|
|||
Render(fmt.Sprint(len(p.names))),
|
||||
)
|
||||
}
|
||||
|
||||
// Confirm asks the user for confirmation.
|
||||
// valid inputs are: y/yes,n/no case insensitive.
|
||||
func Confirm(s string) bool {
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
|
||||
for {
|
||||
fmt.Printf("%s [y/n]: ", s)
|
||||
|
||||
response, err := reader.ReadString('\n')
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
response = strings.ToLower(strings.TrimSpace(response))
|
||||
switch response {
|
||||
case "y", "yes":
|
||||
return true
|
||||
case "n", "no":
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue