daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-09 20:33:15 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:3fbfd0a0576e0cb01353aa765ecbd6c6fe892381
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
...
compare: daylin:5eba4c2604506ba30bcd916bb62934dc11a58d07
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

2 commits
3fbfd0a057 ... 5eba4c2604

Author SHA1 Message Date
Daylin Morgan
5eba4c2604
generalize the oizys ci cmd 2024-07-22 12:38:55 -05:00
daylin-bot
4c46c2ec9d flake.lock: Update 
Flake lock file updates:

• Updated input 'lix':
    '94a8e5fe0d.tar.gz?narHash=sha256-9t5I5t%2BvKBWaERUi4PMNj9BaPBe6zqr8EWOaC//dlvQ%3D' (2024-07-21)
  → '2d4aca2546.tar.gz?narHash=sha256-eUvPvpDLRl6553EsoUmzgNYES8X4CYYoWIJ64hhvfGg%3D' (2024-07-21)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/8ebede998342477736e0d0acdcc13ddb166a335f?narHash=sha256-fwTSeMR1senkBPaKQyOkbkmFu3%2B8jj3UHoLZ3TcrOfw%3D' (2024-07-17)
  → 'github:nix-community/NixOS-WSL/6686cbe947cb8b135e229ad2a3447b88d1cf6da9?narHash=sha256-2VX/zPeLhGTsHpToFH1gfI%2BoGNS6m7ZUWWaqwmw3HVY%3D' (2024-07-22)
• Updated input 'nixos-wsl/nixpkgs':
    'github:NixOS/nixpkgs/f12ee5f64c6a09995e71c9626d88c4efa983b488?narHash=sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE%3D' (2024-07-12)
  → 'github:NixOS/nixpkgs/0c53b6b8c2a3e46c68e04417e247bba660689c9d?narHash=sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk%3D' (2024-07-19)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d43f0636fc9492e83be8bbb41f9595d7a87106b8?narHash=sha256-EDPL9qJfklXoowl3nEBmjDIqcvXKUZInt5n6CCc1Hn4%3D' (2024-07-20)
  → 'github:nixos/nixpkgs/c19d62ad2265b16e2199c5feb4650fe459ca1c46?narHash=sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI%3D' (2024-07-21)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/ae7066aa9f8080578753991dc8b33b1c8cd747b8?narHash=sha256-60Ii3X0ijpHJEV69oc5RP1d9AGtmIg8JhKqt750Zy3k%3D' (2024-07-20)
  → 'github:nix-community/nixpkgs-wayland/6d34f9c34bdab180fd15185c87a44b3bd11cb4c0?narHash=sha256-o1thi0iay9AfkqkopNsPfc70bfHD%2BNcsKOs3IYwRk/A%3D' (2024-07-21)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/6e56a6fd1d993eb02c991d449819f01340888e02?narHash=sha256-ggCV3etL7W1X9kxhLPZP35%2BBBh1LgQybene%2BL/aeQaQ%3D' (2024-07-14)
  → 'github:nix-community/lib-aggregate/e0ea775feda9f162a153ee1ca8d93367dd0ee028?narHash=sha256-xsiynNj2qUbssiD5m%2B8ftWrGQflyOo5C4lPbqragiMc%3D' (2024-07-21)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/3b0b1763c0f0931deaa2980b7b146f8ae7a6a952?narHash=sha256-z3Lp%2B%2B7k4l/3K4A%2B7v3cuHBNcm/vntGXgxElLH%2BINa4%3D' (2024-07-14)
  → 'github:nix-community/nixpkgs.lib/31a99025ce3784c20dd11dafa5260e80e314f59e?narHash=sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ%3D' (2024-07-21)
• Updated input 'pixi':
    'github:daylinmorgan/pixi-flake/499a51e5680ea6cc2ecba745acf6dac99a6d6df1?narHash=sha256-XYct3lgUeSTmUuhWrlfsOtyRKdiHEoLRdRiKy8zO6gg%3D' (2024-07-05)
  → 'github:daylinmorgan/pixi-flake/433b4c14e9dc9ed8b0fb4d36ff7a092b8d6fa12e?narHash=sha256-Kq5rZ5wRGLT/a7Gsdi0xBm6%2BFjPbHgpGUOWmYiZfv1A%3D' (2024-07-22)
• Updated input 'pixi/pixi-source':
    'github:prefix-dev/pixi/3b586c5cd00a3b05e68ba6f6fa08c5e8e2481541?narHash=sha256-V/Q4r3z/Qa5EKottQNEgZuxhhUk8C/j4shEiHmBNs/A%3D' (2024-07-05)
  → 'github:prefix-dev/pixi/68062d9582b4c14c63f17791b96620908d4148be?narHash=sha256-N8nNB%2BFOD8n%2BW7jFYhq9JoEnLOq6xLMLBC77DiK3RLU%3D' (2024-07-22)
• Updated input 'roc':
    'github:roc-lang/roc/db9a5fd2618694e14e22816db66429344d5c93e5?narHash=sha256-4Cq5sZE9SIOz8ztY5rl9pnxLGhDd2kF6sZKSnRgMV5A%3D' (2024-07-21)
  → 'github:roc-lang/roc/f40fab3da248eec17011b6f38528d3031c0d1bd7?narHash=sha256-phUXaqhxxRoeLeLFMCszqrG3/dz6b0qfPmhdLqUrSng%3D' (2024-07-22)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/75aa5b5492208e97531b12de0cb9dcf8705137e9?narHash=sha256-dR/kNTKeiF5VSQRjF8rKJprk844RlZbTEmdJ8UNcaiI%3D' (2024-07-21)
  → 'github:Cloudef/zig2nix/8fd628f6d4ee1cfdfcb36f6a418400603f681f5e?narHash=sha256-YQub2pEdobdJfxrbK8%2BlMckNerPsmdaEPskxGpKGF34%3D' (2024-07-22)
 2024-07-22 16:42:01 +00:00
3 changed files with 39 additions and 37 deletions
Show stats Expand all files Collapse all files

70
flake.lock
View file

@ -483,11 +483,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1720958877, "lastModified": 1721563874,
"narHash": "sha256-ggCV3etL7W1X9kxhLPZP35+BBh1LgQybene+L/aeQaQ=", "narHash": "sha256-xsiynNj2qUbssiD5m+8ftWrGQflyOo5C4lPbqragiMc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "6e56a6fd1d993eb02c991d449819f01340888e02", "rev": "e0ea775feda9f162a153ee1ca8d93367dd0ee028",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +499,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1721558553, "lastModified": 1721559271,
"narHash": "sha256-9t5I5t+vKBWaERUi4PMNj9BaPBe6zqr8EWOaC//dlvQ=", "narHash": "sha256-eUvPvpDLRl6553EsoUmzgNYES8X4CYYoWIJ64hhvfGg=",
"rev": "94a8e5fe0dcee9b079c7f0658680098a989affa1", "rev": "2d4aca25468184fdd2f6be034ab9aa9c28d2839e",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/94a8e5fe0dcee9b079c7f0658680098a989affa1.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2d4aca25468184fdd2f6be034ab9aa9c28d2839e.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -628,11 +628,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1721226275, "lastModified": 1721650907,
"narHash": "sha256-fwTSeMR1senkBPaKQyOkbkmFu3+8jj3UHoLZ3TcrOfw=", "narHash": "sha256-2VX/zPeLhGTsHpToFH1gfI+oGNS6m7ZUWWaqwmw3HVY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "8ebede998342477736e0d0acdcc13ddb166a335f", "rev": "6686cbe947cb8b135e229ad2a3447b88d1cf6da9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -659,11 +659,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1720918433, "lastModified": 1721523216,
"narHash": "sha256-z3Lp++7k4l/3K4A+7v3cuHBNcm/vntGXgxElLH+INa4=", "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "3b0b1763c0f0931deaa2980b7b146f8ae7a6a952", "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -680,11 +680,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1721507810, "lastModified": 1721566265,
"narHash": "sha256-60Ii3X0ijpHJEV69oc5RP1d9AGtmIg8JhKqt750Zy3k=", "narHash": "sha256-o1thi0iay9AfkqkopNsPfc70bfHD+NcsKOs3IYwRk/A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "ae7066aa9f8080578753991dc8b33b1c8cd747b8", "rev": "6d34f9c34bdab180fd15185c87a44b3bd11cb4c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -727,11 +727,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1720823163, "lastModified": 1721409541,
"narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=", "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488", "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -743,11 +743,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1721497942, "lastModified": 1721559948,
"narHash": "sha256-EDPL9qJfklXoowl3nEBmjDIqcvXKUZInt5n6CCc1Hn4=", "narHash": "sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d43f0636fc9492e83be8bbb41f9595d7a87106b8", "rev": "c19d62ad2265b16e2199c5feb4650fe459ca1c46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -811,11 +811,11 @@
"pixi-source": "pixi-source" "pixi-source": "pixi-source"
}, },
"locked": { "locked": {
"lastModified": 1720214426, "lastModified": 1721665957,
"narHash": "sha256-XYct3lgUeSTmUuhWrlfsOtyRKdiHEoLRdRiKy8zO6gg=", "narHash": "sha256-Kq5rZ5wRGLT/a7Gsdi0xBm6+FjPbHgpGUOWmYiZfv1A=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "pixi-flake", "repo": "pixi-flake",
"rev": "499a51e5680ea6cc2ecba745acf6dac99a6d6df1", "rev": "433b4c14e9dc9ed8b0fb4d36ff7a092b8d6fa12e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -827,16 +827,16 @@
"pixi-source": { "pixi-source": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1720188477, "lastModified": 1721638392,
"narHash": "sha256-V/Q4r3z/Qa5EKottQNEgZuxhhUk8C/j4shEiHmBNs/A=", "narHash": "sha256-N8nNB+FOD8n+W7jFYhq9JoEnLOq6xLMLBC77DiK3RLU=",
"owner": "prefix-dev", "owner": "prefix-dev",
"repo": "pixi", "repo": "pixi",
"rev": "3b586c5cd00a3b05e68ba6f6fa08c5e8e2481541", "rev": "68062d9582b4c14c63f17791b96620908d4148be",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "prefix-dev", "owner": "prefix-dev",
"ref": "v0.25.0", "ref": "v0.26.1",
"repo": "pixi", "repo": "pixi",
"type": "github" "type": "github"
} }
@ -852,11 +852,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1721563612, "lastModified": 1721646716,
"narHash": "sha256-4Cq5sZE9SIOz8ztY5rl9pnxLGhDd2kF6sZKSnRgMV5A=", "narHash": "sha256-phUXaqhxxRoeLeLFMCszqrG3/dz6b0qfPmhdLqUrSng=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "db9a5fd2618694e14e22816db66429344d5c93e5", "rev": "f40fab3da248eec17011b6f38528d3031c0d1bd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1151,11 +1151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721524885, "lastModified": 1721611096,
"narHash": "sha256-dR/kNTKeiF5VSQRjF8rKJprk844RlZbTEmdJ8UNcaiI=", "narHash": "sha256-YQub2pEdobdJfxrbK8+lMckNerPsmdaEPskxGpKGF34=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "75aa5b5492208e97531b12de0cb9dcf8705137e9", "rev": "8fd628f6d4ee1cfdfcb36f6a418400603f681f5e",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
pkgs/oizys/cmd/ci.go
View file

@ -13,13 +13,14 @@ import (
var ciCmd = &cobra.Command{ var ciCmd = &cobra.Command{
Use: "ci", Use: "ci",
Short: "offload build to GHA", Short: "offload build to GHA",
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
inputs := make(map[string]interface{}) inputs := make(map[string]interface{})
if includeLock { if includeLock {
log.Debug("including lock file in inputs") log.Debug("including lock file in inputs")
inputs["lockFile"] = readLockFile() inputs["lockFile"] = readLockFile()
} }
github.CreateDispatch("build.yml", ref, inputs) github.CreateDispatch(args[0], ref, inputs)
}, },
} }

3
pkgs/oizys/internal/github/main.go
View file

@ -61,7 +61,7 @@ func GetArtifacts(runID int64) (*github.ArtifactList, *github.Response) {
} }
func GetUpdateSummaryArtifact(runID int64, host string) *github.Artifact { func GetUpdateSummaryArtifact(runID int64, host string) *github.Artifact {
artifactName := fmt.Sprintf("%s-summary", host) artifactName := fmt.Sprintf("%s-summary", host)
artifactList, _ := GetArtifacts(runID) artifactList, _ := GetArtifacts(runID)
for _, artifact := range artifactList.Artifacts { for _, artifact := range artifactList.Artifacts {
if artifact.GetName() == artifactName { if artifact.GetName() == artifactName {
@ -165,6 +165,7 @@ func ReadMarkdownFromZip(zipData []byte, fileName string) (string, error) {
// } // }
func CreateDispatch(workflowFileName string, ref string, inputs map[string]interface{}) { func CreateDispatch(workflowFileName string, ref string, inputs map[string]interface{}) {
log.Infof("creating dispatch event for %s", workflowFileName)
event := github.CreateWorkflowDispatchEventRequest{Ref: ref, Inputs: inputs} event := github.CreateWorkflowDispatchEventRequest{Ref: ref, Inputs: inputs}
_, err := client.Actions.CreateWorkflowDispatchEventByFileName( _, err := client.Actions.CreateWorkflowDispatchEventByFileName(
context.Background(), context.Background(),