From 850cdf4c3bd84ea78bc7823ef196846bb8d125eb Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 2 May 2024 17:01:00 +0200
Subject: [PATCH] ci: jq is already part of ci environment (#767)

* ci: jq is already part of ci environment

* ci: add --accept-flake-config flag to actually use the binary cache from flake.nix
---
 .github/actions/common-setup/action.yml       | 5 -----
 .github/workflows/build-flake-info.yml        | 2 +-
 .github/workflows/check-flake-files.yml       | 2 +-
 .github/workflows/import-to-elasticsearch.yml | 6 +++---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml
index 25739d3..54e46cc 100644
--- a/.github/actions/common-setup/action.yml
+++ b/.github/actions/common-setup/action.yml
@@ -21,8 +21,3 @@ runs:
       with:
         name: nixos-search
         signingKey: '${{ inputs.CACHIX_SIGNING_KEY }}'
-
-    - name: Installing jq
-      shell: bash
-      run: |
-        nix-env -f '<nixpkgs>' -iA jq
diff --git a/.github/workflows/build-flake-info.yml b/.github/workflows/build-flake-info.yml
index d18de69..394d97e 100644
--- a/.github/workflows/build-flake-info.yml
+++ b/.github/workflows/build-flake-info.yml
@@ -27,4 +27,4 @@ jobs:
 
     - name: Building flake-info
       run: |
-        nix -vL build .#flake-info
+        nix --accept-flake-config -vL build .#flake-info
diff --git a/.github/workflows/check-flake-files.yml b/.github/workflows/check-flake-files.yml
index 36595ac..c01eda8 100644
--- a/.github/workflows/check-flake-files.yml
+++ b/.github/workflows/check-flake-files.yml
@@ -37,7 +37,7 @@ jobs:
         do
           echo "::group::Group \"$(basename $flake_group .toml)\""
 
-         nix run .#flake-info -- group "$flake_group" "$(basename "$flake_group" .toml)" --report
+         nix run --accept-flake-config .#flake-info -- group "$flake_group" "$(basename "$flake_group" .toml)" --report
 
           if [[ -f "./report.txt" ]]
           then
diff --git a/.github/workflows/import-to-elasticsearch.yml b/.github/workflows/import-to-elasticsearch.yml
index a5fa081..ed67b70 100644
--- a/.github/workflows/import-to-elasticsearch.yml
+++ b/.github/workflows/import-to-elasticsearch.yml
@@ -30,7 +30,7 @@ jobs:
     - name: NixOS Channels
       id: nixos-channels
       run: |
-        nix build -L .#nixosChannels
+        nix build --accept-flake-config -L .#nixosChannels
         channels="{\"channel\": $(< ./result)}"
         echo "$channels"
         echo "matrix=$channels" >> "$GITHUB_OUTPUT"
@@ -62,7 +62,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        nix run .#flake-info -- --push --elastic-schema-version=$(< VERSION) nixpkgs ${{ matrix.channel }}
+        nix run --accept-flake-config .#flake-info -- --push --elastic-schema-version=$(< VERSION) nixpkgs ${{ matrix.channel }}
       if: github.repository_owner == 'NixOS'
 
     - name: Warmup ${{ matrix.channel }} channel
@@ -110,7 +110,7 @@ jobs:
 
     - name: Import ${{ matrix.group }} group
       run: |
-        nix run .#flake-info -- --push --elastic-schema-version=$(< ./VERSION) group ./flakes/${{ matrix.group }}.toml ${{ matrix.group }}
+        nix run --accept-flake-config .#flake-info -- --push --elastic-schema-version=$(< ./VERSION) group ./flakes/${{ matrix.group }}.toml ${{ matrix.group }}
       if: github.repository_owner == 'NixOS'
 
     - name: Warmup ${{ matrix.group }} group