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:4c46c2ec9d82ebbd798b2d94fa30a3992d7d00a4
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:6c6eb759d3089382f1133cc486398ef65c846896
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
4c46c2ec9d ... 6c6eb759d3

Author SHA1 Message Date
daylin-bot
6c6eb759d3 flake.lock: Update 
Flake lock file updates:

• Updated input 'lix':
    '2d4aca2546.tar.gz?narHash=sha256-eUvPvpDLRl6553EsoUmzgNYES8X4CYYoWIJ64hhvfGg%3D' (2024-07-21)
  → '73c013a5df.tar.gz?narHash=sha256-1wsdWsGGssAgbCe3JQXbbwjhYO3q1eGtydGXJb3aOV0%3D' (2024-07-22)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c19d62ad2265b16e2199c5feb4650fe459ca1c46?narHash=sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI%3D' (2024-07-21)
  → 'github:nixos/nixpkgs/453402b94f39f968a7c27df28e060f69e4a50c3b?narHash=sha256-iQ%2Bquy3A1EKeFyLyAtjhgSvZHH7r%2BxybXZkxMhasN4I%3D' (2024-07-22)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/6d34f9c34bdab180fd15185c87a44b3bd11cb4c0?narHash=sha256-o1thi0iay9AfkqkopNsPfc70bfHD%2BNcsKOs3IYwRk/A%3D' (2024-07-21)
  → 'github:nix-community/nixpkgs-wayland/79e1f9e956c60af6520c5f9d9e451e555a82da6f?narHash=sha256-z3h4XqAdE1sqCdZxI9%2BgxLDEEbgGOVHIWZRMIjQheDo%3D' (2024-07-22)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/1d9c2c9b3e71b9ee663d11c5d298727dace8d374?narHash=sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0%3D' (2024-07-19)
  → 'github:nixos/nixpkgs/68c9ed8bbed9dfce253cc91560bf9043297ef2fe?narHash=sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8%3D' (2024-07-21)
• Updated input 'zls':
    'github:zigtools/zls/aa9c9126e732aafed144ceea21c5868d33b2954d?narHash=sha256-nQ4XXLwYQlRhGFn2a5zjr53y%2BZWNqJmIPF0JmLUg22E%3D' (2024-07-20)
  → 'github:zigtools/zls/3b9216e4444395ab1ee35911e9927571f8291fad?narHash=sha256-d1mN/mYLscdJOwg3%2By0ZhrTYIEGdsnTdhsmu/51X2n8%3D' (2024-07-22)
 2024-07-23 00:32:41 +00:00
Daylin Morgan
5eba4c2604
generalize the oizys ci cmd 2024-07-22 12:38:55 -05:00
3 changed files with 20 additions and 18 deletions
Show stats Expand all files Collapse all files

32
flake.lock
View file

@ -499,11 +499,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1721559271, "lastModified": 1721690099,
"narHash": "sha256-eUvPvpDLRl6553EsoUmzgNYES8X4CYYoWIJ64hhvfGg=", "narHash": "sha256-1wsdWsGGssAgbCe3JQXbbwjhYO3q1eGtydGXJb3aOV0=",
"rev": "2d4aca25468184fdd2f6be034ab9aa9c28d2839e", "rev": "73c013a5df09a9edf7a6d2fa0be8349d89f856cd",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2d4aca25468184fdd2f6be034ab9aa9c28d2839e.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/73c013a5df09a9edf7a6d2fa0be8349d89f856cd.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -680,11 +680,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1721566265, "lastModified": 1721691437,
"narHash": "sha256-o1thi0iay9AfkqkopNsPfc70bfHD+NcsKOs3IYwRk/A=", "narHash": "sha256-z3h4XqAdE1sqCdZxI9+gxLDEEbgGOVHIWZRMIjQheDo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "6d34f9c34bdab180fd15185c87a44b3bd11cb4c0", "rev": "79e1f9e956c60af6520c5f9d9e451e555a82da6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -743,11 +743,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1721559948, "lastModified": 1721622093,
"narHash": "sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI=", "narHash": "sha256-iQ+quy3A1EKeFyLyAtjhgSvZHH7r+xybXZkxMhasN4I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c19d62ad2265b16e2199c5feb4650fe459ca1c46", "rev": "453402b94f39f968a7c27df28e060f69e4a50c3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +775,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1721379653, "lastModified": 1721562059,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1175,11 +1175,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1721500946, "lastModified": 1721667510,
"narHash": "sha256-nQ4XXLwYQlRhGFn2a5zjr53y+ZWNqJmIPF0JmLUg22E=", "narHash": "sha256-d1mN/mYLscdJOwg3+y0ZhrTYIEGdsnTdhsmu/51X2n8=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "aa9c9126e732aafed144ceea21c5868d33b2954d", "rev": "3b9216e4444395ab1ee35911e9927571f8291fad",
"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(),