From 4551309d46a234e66abce6de341021d42a0c3e31 Mon Sep 17 00:00:00 2001 From: Tulili Date: Thu, 18 Apr 2024 00:48:23 -0300 Subject: [PATCH] fix: use the new recipes directory for storing recipes :) --- .github/workflows/build.yml | 8 ++++---- flake.lock | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9cfa5d8..3ed4459 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,9 +27,9 @@ jobs: shell: bash run: | sudo apt install -y jsonnet - mkdir config/recipes + mkdir recipes - RECIPES=$(jsonnet ./config/templates/recipe-std.jsonnet -m ./config/recipes -y) + RECIPES=$(jsonnet ./config/templates/recipe-std.jsonnet -m ./recipes -y) # newlines replaced with spaces echo "Generated recipes: ${RECIPES//$'\n'/ }" @@ -70,8 +70,8 @@ jobs: id: recipe_meta run: | sudo apt install -y jsonnet - mkdir config/recipes - jsonnet ./config/templates/recipe-std.jsonnet -m ./config/recipes -y + mkdir recipes + jsonnet ./config/templates/recipe-std.jsonnet -m ./recipes -y echo "IMAGE_NAME=$(yq '.name' ./${{matrix.recipe}} )" >> $GITHUB_OUTPUT echo "IMAGE_DESCRIPTION=$(yq '.description' ./${{matrix.recipe}} )" >> $GITHUB_OUTPUT diff --git a/flake.lock b/flake.lock index 0c273c7..b139a3c 100644 --- a/flake.lock +++ b/flake.lock @@ -237,12 +237,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", - "revCount": 601756, + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "revCount": 612413, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.601756%2Brev-44d0940ea560dee511026a53f0e2e2cde489b4d4/018e6c73-b9c2-7b70-a778-9c1546525f10/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.612413%2Brev-5672bc9dbf9d88246ddab5ac454e82318d094bb8/018ee842-f990-7838-843a-63e9d591101c/source.tar.gz" }, "original": { "type": "tarball", @@ -399,11 +399,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1711382066, - "narHash": "sha256-rB38jtWQMwsTfriGbvVnD3Ebkqli44SEdQTCYl3dKeI=", + "lastModified": 1713282795, + "narHash": "sha256-5QQmZAknJJgUYCjVdsdhOot2H1AIucFfoAJxmQmaK3Y=", "owner": "atomic-studio-org", "repo": "Utility-Flake-Library", - "rev": "61757a7674092ccd92afb47b9cdc4f7ae170bc2d", + "rev": "f2a6376b3508a52fb8d6125a39e250ff4faddd90", "type": "github" }, "original": {