From 09cd6c94a27229fcf9b637a5399fae51c1bbba96 Mon Sep 17 00:00:00 2001
From: dzmitry-lahoda <dzmitry@lahoda.pro>
Date: Wed, 9 Aug 2023 09:53:19 +0100
Subject: [PATCH 1/3] chore(ci): improving ability to run devnet

---
 .github/workflows/pr-workflow.yml |  8 ++++----
 flake/ci.md                       | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/pr-workflow.yml b/.github/workflows/pr-workflow.yml
index 04aaac4e960..e1e6e245b16 100644
--- a/.github/workflows/pr-workflow.yml
+++ b/.github/workflows/pr-workflow.yml
@@ -513,13 +513,13 @@ jobs:
 
   push-docker-images:
     name: push-docker-images
-    if: ${{ inputs.github_event_name == 'push' }}   
-    needs: 
-      - draft-release-check
+    #if: ${{ inputs.github_event_name == 'push' }}   
+    # needs: 
+    #   - draft-release-check
     runs-on:
       - x86_64-linux-32C-128GB-2TB
     concurrency:
-      group: ${{ inputs.github_workflow }}-push-docker-images-${{ github.event.pull_request.number || github.ref }}
+      group: ${{inputs.github_event_name}}-${{ inputs.github_workflow }}-push-docker-images-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:          
       - name: Set up Cachix
diff --git a/flake/ci.md b/flake/ci.md
index 7a6660e8c47..39fe7c94c8a 100644
--- a/flake/ci.md
+++ b/flake/ci.md
@@ -21,22 +21,22 @@ set -o errexit
 adduser actions-runner --disabled-password && passwd --delete actions-runner
 sh <(curl -L https://nixos.org/nix/install) --daemon --yes && source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
 cat > /etc/nix/nix.conf << EOF
-    experimental-features = nix-command flakes
-    sandbox = relaxed
-    narinfo-cache-negative-ttl = 0      
-    system-features = kvm     
-    trusted-users = root actions-runner
-    max-jobs = 1
-    cores = 64
-    auto-optimise-store = true
+    # keep-derivations = true
+    # keep-outputs = true
     allow-import-from-derivation = true
+    auto-optimise-store = true
+    cores = 64
+    experimental-features = nix-command flakes
     gc-reserved-space = 18388608
     http-connections = 32
     http2 = true
-    min-free = 100000000000
     max-free = 1000000000000
-    # keep-outputs = true
-    # keep-derivations = true
+    max-jobs = 1
+    min-free = 100000000000
+    narinfo-cache-negative-ttl = 0
+    sandbox = relaxed
+    system-features = kvm     
+    trusted-users = root actions-runner
 EOF
 service nix-daemon restart
 apt-get update && apt-get install apt-transport-https qemu-system-x86 ca-certificates curl gnupg software-properties-common --yes

From 87e826cdfb290584a8579e8330bf9dfe4bb8ab92 Mon Sep 17 00:00:00 2001
From: dzmitry-lahoda <dzmitry@lahoda.pro>
Date: Wed, 9 Aug 2023 10:16:02 +0100
Subject: [PATCH 2/3] allow job to finish

---
 .github/workflows/pr-workflow.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pr-workflow.yml b/.github/workflows/pr-workflow.yml
index e1e6e245b16..ce1b8d65fbb 100644
--- a/.github/workflows/pr-workflow.yml
+++ b/.github/workflows/pr-workflow.yml
@@ -513,14 +513,14 @@ jobs:
 
   push-docker-images:
     name: push-docker-images
-    #if: ${{ inputs.github_event_name == 'push' }}   
-    # needs: 
-    #   - draft-release-check
+    if: ${{ inputs.flow == 'push' }}   
+    needs: 
+      - draft-release-check
     runs-on:
       - x86_64-linux-32C-128GB-2TB
     concurrency:
-      group: ${{inputs.github_event_name}}-${{ inputs.github_workflow }}-push-docker-images-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
+      group: ${{inputs.flow}}-${{ inputs.github_workflow }}-push-docker-images-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: false
     steps:          
       - name: Set up Cachix
         uses: cachix/cachix-action@586bf280495080c5a6d4868237ad28a860e4b309

From 6cb440d8e9abadd9d48663d955fad6723a546ba9 Mon Sep 17 00:00:00 2001
From: dzmitry-lahoda <dzmitry@lahoda.pro>
Date: Wed, 9 Aug 2023 10:38:20 +0100
Subject: [PATCH 3/3] tree

---
 flake/ci.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake/ci.md b/flake/ci.md
index 39fe7c94c8a..d8979a38fe7 100644
--- a/flake/ci.md
+++ b/flake/ci.md
@@ -54,7 +54,7 @@ su actions-runner
 ## User
 
 ```bash
-nix profile install "nixpkgs#git" "nixpkgs#git-lfs" "nixpkgs#cachix" "nixpkgs#process-compose" "nixpkgs#dasel"
+nix profile install "nixpkgs#git" "nixpkgs#git-lfs" "nixpkgs#cachix" "nixpkgs#process-compose" "nixpkgs#dasel" "nixpkgs#nix-tree"
 ```
 
 ### x84_64