mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-25 08:30:45 -06:00
Compare commits
2 commits
389d07413e
...
95223a9a25
| Author | SHA1 | Date | |
|---|---|---|---|
|
95223a9a25 | ||
830d27389c
|
7 changed files with 16 additions and 34 deletions
2
.github/workflows/update.yml
vendored
2
.github/workflows/update.yml
vendored
|
|
@ -58,7 +58,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
host:
|
||||
hosts:
|
||||
- othalan
|
||||
- algiz
|
||||
- mannaz
|
||||
|
|
|
|||
|
|
@ -498,11 +498,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1721314880,
|
||||
"narHash": "sha256-39RhKptnozRK63T4l6TcXGKjCXsvcetC4zCMj+0Xthw=",
|
||||
"rev": "7b1abf81076c93a84becc310722013e44d850002",
|
||||
"lastModified": 1721253059,
|
||||
"narHash": "sha256-GSzKw0vbUMpqKnOa6xJ4Fm1K/f1Cm9SrP0O8BP/6GZs=",
|
||||
"rev": "68567206f244f26f4830030c172d63c3dc9a13a1",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7b1abf81076c93a84becc310722013e44d850002.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/68567206f244f26f4830030c172d63c3dc9a13a1.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
|
|||
|
|
@ -63,11 +63,6 @@ let
|
|||
(substring 6 2 longDate)
|
||||
]);
|
||||
|
||||
flakeVer =
|
||||
flake:
|
||||
"${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}";
|
||||
|
||||
|
||||
isNixFile = p: hasSuffix ".nix" p;
|
||||
isDefaultNixFile = p: hasSuffix "default.nix" p;
|
||||
filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
|
||||
|
|
@ -86,6 +81,5 @@ in
|
|||
mkIfIn
|
||||
isNixFile
|
||||
listNixFilesRecursive
|
||||
flakeVer
|
||||
;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,23 +6,14 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkIfIn flakeVer;
|
||||
|
||||
version = flakeVer inputs.roc;
|
||||
inherit (lib) mkIfIn;
|
||||
cfg = config.oizys.languages;
|
||||
rocPkgs = inputs.roc.packages.${pkgs.system};
|
||||
# I'm setting the versions so the changes are more apparent as flake is updated
|
||||
roc = rocPkgs.cli.overrideAttrs {
|
||||
inherit version;
|
||||
|
||||
};
|
||||
lang-server = rocPkgs.lang-server.overrideAttrs {
|
||||
inherit version;
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
config = mkIfIn "roc" cfg {
|
||||
environment.systemPackages = [roc lang-server];
|
||||
environment.systemPackages = with rocPkgs; [
|
||||
full # cli + lang_server
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ var updateCmd = &cobra.Command{
|
|||
Short: "update and run nixos rebuild",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
run := github.GetLastUpdateRun()
|
||||
md, err := github.GetUpateSummary(run.GetID(), oizys.GetHost())
|
||||
md, err := github.GetUpateSummary(run.GetID())
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,11 +60,10 @@ func GetArtifacts(runID int64) (*github.ArtifactList, *github.Response) {
|
|||
return artifactList, resp
|
||||
}
|
||||
|
||||
func GetUpdateSummaryArtifact(runID int64, host string) *github.Artifact {
|
||||
artifactName := fmt.Sprintf("%s-summary", host)
|
||||
func GetUpdateSummaryArtifact(runID int64) *github.Artifact {
|
||||
artifactList, _ := GetArtifacts(runID)
|
||||
for _, artifact := range artifactList.Artifacts {
|
||||
if artifact.GetName() == artifactName {
|
||||
if artifact.GetName() == "summary" {
|
||||
return artifact
|
||||
}
|
||||
}
|
||||
|
|
@ -72,8 +71,8 @@ func GetUpdateSummaryArtifact(runID int64, host string) *github.Artifact {
|
|||
return nil
|
||||
}
|
||||
|
||||
func GetUpdateSummaryUrl(runID int64, host string) *url.URL {
|
||||
artifact := GetUpdateSummaryArtifact(runID, host)
|
||||
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)
|
||||
|
|
@ -110,8 +109,8 @@ func GetLastUpdateRun() *github.WorkflowRun {
|
|||
return run
|
||||
}
|
||||
|
||||
func GetUpateSummary(runID int64, host string) (string, error) {
|
||||
url := GetUpdateSummaryUrl(runID, host)
|
||||
func GetUpateSummary(runID int64) (string, error) {
|
||||
url := GetUpdateSummaryUrl(runID)
|
||||
bytes := GetUpdateSummaryFromUrl(url)
|
||||
md, err := ReadMarkdownFromZip(bytes, "summary.md")
|
||||
return md, err
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import (
|
|||
"fmt"
|
||||
"io/fs"
|
||||
"oizys/internal/git"
|
||||
|
||||
// "oizys/internal/github"
|
||||
"oizys/internal/ui"
|
||||
"os"
|
||||
|
|
@ -100,7 +99,6 @@ func SetHost(name string) {
|
|||
}
|
||||
}
|
||||
|
||||
func GetHost() string { return o.host }
|
||||
func SetVerbose(v bool) {
|
||||
o.verbose = v
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue