From 3a8e2de39610bf76fd9c4724b9a79846d1d90d7c Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 28 Jun 2021 09:56:26 +0200
Subject: hydra: hopefully fix build products

---
 flake.nix | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index e11b29d..2cad862 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,10 +55,16 @@
             { }
             ''
               mkdir -p $out/nix-support
-              echo "file bootImg ${bootImg}" >> $out/nix-support/hydra-build-products
-              echo "file factoryImg ${factoryImg}" >> $out/nix-support/hydra-build-products
-              echo "file img ${img}" >> $out/nix-support/hydra-build-products
-              echo "file ota ${ota}" >> $out/nix-support/hydra-build-products
+
+              cp "${bootImg}" $out/boot.img
+              cp "${factoryImg}" $out/FP3-factory-${config.buildNumber}.zip
+              cp "${img}" $out/FP3-img-${config.buildNumber}.zip
+              cp "${ota}" $out/FP3-ota_update-${config.buildNumber}.zip
+
+              echo "file bootImg $out/boot.img" >> $out/nix-support/hydra-build-products
+              echo "file factoryImg $out/FP3-factory-${config.buildNumber}.zip" >> $out/nix-support/hydra-build-products
+              echo "file img $out/FP3-img-${config.buildNumber}.zip" >> $out/nix-support/hydra-build-products
+              echo "file ota $out/FP3-ota_update-${config.buildNumber}.zip" >> $out/nix-support/hydra-build-products
             '';
         fp2 = with self.robotnixConfigurations.fp2;
           runCommandLocal
@@ -66,10 +72,16 @@
             { }
             ''
               mkdir -p $out/nix-support
-              echo "file bootImg ${bootImg}" >> $out/nix-support/hydra-build-products
-              echo "file factoryImg ${factoryImg}" >> $out/nix-support/hydra-build-products
-              echo "file img ${img}" >> $out/nix-support/hydra-build-products
-              echo "file ota ${ota}" >> $out/nix-support/hydra-build-products
+
+              cp "${bootImg}" $out/boot.img
+              cp "${factoryImg}" $out/FP2-factory-${config.buildNumber}.zip
+              cp "${img}" $out/FP2-img-${config.buildNumber}.zip
+              cp "${ota}" $out/FP2-ota_update-${config.buildNumber}.zip
+
+              echo "file bootImg $out/boot.img" >> $out/nix-support/hydra-build-products
+              echo "file factoryImg $out/FP2-factory-${config.buildNumber}.zip" >> $out/nix-support/hydra-build-products
+              echo "file img $out/FP2-img-${config.buildNumber}.zip" >> $out/nix-support/hydra-build-products
+              echo "file ota $out/FP2-ota_update-${config.buildNumber}.zip" >> $out/nix-support/hydra-build-products
             '';
       };
     };
-- 
cgit v1.2.3