From 2e07b3e9876b05a07c51c8a5f8beb163e332bba8 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Wed, 16 Oct 2024 21:39:09 +0200 Subject: [PATCH] fix(ci-cd): Fix CI:CD --- .github/workflows/release-nightly.yaml | 2 +- flake.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-nightly.yaml b/.github/workflows/release-nightly.yaml index 14fc41b..8c95f0f 100644 --- a/.github/workflows/release-nightly.yaml +++ b/.github/workflows/release-nightly.yaml @@ -15,7 +15,7 @@ jobs: - name: Check version in code matches flake version shell: bash run: | - if ! [ $(grep '// CI:CD-VERSION$' server/root-handler/handler.go | cut -d'"' -f 2) = $(nix eval --file flake.nix inputs.version | cut -d '"' -f 2) ]; + if ! [ $(grep '// CI:CD-VERSION$' server/root-handler/handler.go | cut -d'"' -f 2) = $(grep '# CI:CD-VERSION$' flake.nix | cut -d'"' -f 2) ]; then echo "Version mismatch" exit 1 diff --git a/flake.nix b/flake.nix index a15c626..a0dce7a 100644 --- a/flake.nix +++ b/flake.nix @@ -9,12 +9,12 @@ inputs.utils.follows = "utils"; }; utils.url = "github:numtide/flake-utils"; - version = "0.1.0"; }; - outputs = { self, nixpkgs, utils, gomod2nix, version }: + outputs = { self, nixpkgs, utils, gomod2nix }: utils.lib.eachDefaultSystem (system: let + version = "0.1.0"; # CI:CD-VERSION pkgs = import nixpkgs { inherit system; overlays = [