From b1dde4221139feacd286c6053d2e8a7591d09fd3 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Mon, 1 Aug 2022 16:58:49 +0200
Subject: [PATCH] Revert "Another attempt at skipping cachix upload without
 tokens"

This reverts commit 9e977cfd6eb79e6d8ba42f7aaa5f75909f9ab0a1.
---
 azure-pipelines.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d8080757f1..a450c7bf69 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -96,18 +96,16 @@ jobs:
   - publish: CompiledSamples
     artifact: Samples ($(TARGET))
   - script: |
-      if [ -z "$[CACHIX_AUTH_TOKEN]" ]; then
-        echo "Token for cachix access not available, skipping."
-        exit
-      fi
       docker start nix -i <<EOF
-          export CACHIX_AUTH_TOKEN=$[CACHIX_AUTH_TOKEN]
+          export CACHIX_AUTH_TOKEN=$(CACHIX_AUTH_TOKEN)
           cd src
           nix-build -A ${TARGET}.retro68.samples | cachix push autc04
           nix-shell -A ${TARGET} --command exit
           nix-store -qR --include-outputs \$(nix-instantiate default.nix -A ${TARGET}) | cachix push autc04
       EOF
     displayName: Push to Cachix
+    condition: ne(variables['CACHIX_AUTH_TOKEN'], '')
+
 
 - job: NixMac
   strategy:
@@ -139,13 +137,11 @@ jobs:
       nix-build -A $(TARGET).retro68.samples
     displayName: build
   - script: |
-      if [ -z "$[CACHIX_AUTH_TOKEN]" ]; then
-        echo "Token for cachix access not available, skipping."
-        exit
-      fi
       . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-      export CACHIX_AUTH_TOKEN=$[CACHIX_AUTH_TOKEN]
+      export CACHIX_AUTH_TOKEN=$(CACHIX_AUTH_TOKEN)
       nix-build -A $(TARGET).retro68.samples | cachix push autc04
       nix-shell -A $(TARGET) --command exit
       nix-store -qR --include-outputs `nix-instantiate default.nix -A $(TARGET)` | cachix push autc04
     displayName: Push to Cachix
+    condition: ne(variables['CACHIX_AUTH_TOKEN'], '')
+