From 46a97eb5d177c74682ee244556d3ddbe66ff8a3e Mon Sep 17 00:00:00 2001 From: Tommy Skaug Date: Fri, 15 Nov 2024 07:24:10 +0100 Subject: [PATCH] chore: cleanup taskfiles --- .taskfiles/ci-os.yaml | 14 ++++++++++++++ .taskfiles/{docker.yaml => misc.yaml} | 13 ------------- Taskfile.yaml | 3 ++- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 .taskfiles/ci-os.yaml rename .taskfiles/{docker.yaml => misc.yaml} (53%) diff --git a/.taskfiles/ci-os.yaml b/.taskfiles/ci-os.yaml new file mode 100644 index 0000000..897afed --- /dev/null +++ b/.taskfiles/ci-os.yaml @@ -0,0 +1,14 @@ +version: "3" + +tasks: + build: + desc: Build local docker image (nixos-builder) + dir: "{{ .ROOT_DIR }}/apps/ci-os" + cmds: + - nix build .#packages.x86_64-linux.build-image && nerdctl load < result + + publish: + desc: Builds and pushes the flakes action image + dir: "{{ .ROOT_DIR }}/apps/ci-os" + cmds: + - nerdctl push code.252.no/tommy/ci-os:latest diff --git a/.taskfiles/docker.yaml b/.taskfiles/misc.yaml similarity index 53% rename from .taskfiles/docker.yaml rename to .taskfiles/misc.yaml index 30d431b..c337b75 100644 --- a/.taskfiles/docker.yaml +++ b/.taskfiles/misc.yaml @@ -1,19 +1,6 @@ version: "3" tasks: - build-ci-os: - desc: Builds and pushes the flakes action image - dir: "{{ .ROOT_DIR }}/apps/lix-builder" - cmds: - - nix build .#packages.x86_64-linux.build-image && nerdctl load < result && - nerdctl push code.252.no/tommy/ci-os:latest - - create-image: - desc: Build local docker image (nixos-builder) - cmds: - - nerdctl build --platform linux/amd64 -t nixos-builder --no-cache - apps/lix-builder - shell: desc: Drop into a build shell env: diff --git a/Taskfile.yaml b/Taskfile.yaml index d3d5328..c775d6e 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -5,7 +5,8 @@ vars: sh: "git rev-parse --show-toplevel" includes: - docker: .taskfiles/docker.yaml + ci-os: .taskfiles/ci-os.yaml + misc: .taskfiles/misc.yaml tasks: default: