From f3aa218de40a44eeaf1e7ec169bb2b3d4da526ad Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Wed, 23 Mar 2022 15:51:48 +0100
Subject: [PATCH] Improve CI script

Upgrade nixbuild-action to put back spaces in the workflow name.
Improve the script for retrieving the result, thanks to @rickynils.
---
 .github/workflows/make-apk.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/make-apk.yml b/.github/workflows/make-apk.yml
index b82926b..6b3c47a 100644
--- a/.github/workflows/make-apk.yml
+++ b/.github/workflows/make-apk.yml
@@ -1,4 +1,4 @@
-name: Build-debug-apk
+name: Build debug apk
 
 on:
   workflow_dispatch:
@@ -14,7 +14,7 @@ jobs:
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - name: Setup nixbuild.net
-      uses: nixbuild/nixbuild-action@v8
+      uses: nixbuild/nixbuild-action@v9
       with:
         nixbuild_ssh_key: ${{ secrets.nixbuild_ssh_key }}
     - name: Checkout repo
@@ -31,11 +31,15 @@ jobs:
         nix-shell ./shell.nix --run 'make debug.keystore'
     - name: Build
       run: |
-        nix build --eval-store auto --store ssh-ng://eu.nixbuild.net \
-          -f ./shell.nix debug-apk
-        nix build -f ./shell.nix debug-apk
+        store=ssh-ng://eu.nixbuild.net
+        result=$(
+          nix build --json --eval-store auto --store $store \
+            -f ./shell.nix debug-apk \
+          | jq -r '.[0].outputs.out'
+        )
+        nix copy --from $store $result
         mkdir -p _build
-        cp result/*.apk _build
+        cp $result/*.apk _build
     - name: Save debug apk
       uses: actions/upload-artifact@v2
       with: