From e61c13e71c2baae559830dfc5ce69242932e74f6 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Mon, 7 Feb 2022 23:30:05 -0500
Subject: [PATCH] feat: push to cachix

---
 .github/workflows/pr.yaml      | 10 +++-------
 .github/workflows/release.yaml | 11 +++--------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 18e4d99..9110f4c 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -4,9 +4,6 @@ on:
     branches: [ main ]
   push:
     branches: [ main ]
-concurrency:
-  cancel-in-progress: true
-  group: ${{ github.actor }}
 jobs:
   pr:
     name: PR
@@ -15,10 +12,6 @@ jobs:
     - name: Clone
       uses: actions/checkout@v2
 
-    - uses: cachix/cachix-action@v10
-      with:
-        name: alejandra
-
     - name: Build
       uses: docker://nixos/nix
       with:
@@ -27,6 +20,7 @@ jobs:
           --extra-experimental-features flakes
           --extra-experimental-features nix-command
           --extra-substituters http://172.17.0.1:5000?trusted=1
+          --extra-substituters https://alejandra.cachix.org?trusted=1
           build
           --print-build-logs
 
@@ -38,6 +32,7 @@ jobs:
           --extra-experimental-features flakes
           --extra-experimental-features nix-command
           --extra-substituters http://172.17.0.1:5000?trusted=1
+          --extra-substituters https://alejandra.cachix.org?trusted=1
           flake
           check
           --print-build-logs
@@ -53,6 +48,7 @@ jobs:
     #           --extra-experimental-features flakes \
     #           --extra-experimental-features nix-command \
     #           --extra-substituters http://172.17.0.1:5000?trusted=1 \
+    #           --extra-substituters https://alejandra.cachix.org?trusted=1 \
     #           print-dev-env \
     #           --no-update-lock-file \
     #           --no-write-lock-file \
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 08c0392..cd30a9a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -2,22 +2,16 @@ name: Release
 on:
   push:
     branches: [ main ]
-concurrency:
-  cancel-in-progress: true
-  group: ${{ github.actor }}
 jobs:
   release:
+    environment:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     name: Release
     runs-on: self-hosted
     steps:
     - name: Clone
       uses: actions/checkout@v2
 
-    - uses: cachix/cachix-action@v10
-      with:
-        name: alejandra
-        authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-
     - name: Build
       uses: docker://nixos/nix
       with:
@@ -27,6 +21,7 @@ jobs:
             --extra-experimental-features flakes
             --extra-experimental-features nix-command
             --extra-substituters http://172.17.0.1:5000?trusted=1
+            --extra-substituters https://alejandra.cachix.org?trusted=1
             build
             --print-build-logs