fixup! WIP: feat(buildbot-nix): configure postBuildSteps to sign and …

…upload to holo's cache
holochain · Oct 19, 2024 · 4cfa967 · 4cfa967
1 parent ed932dc
commit 4cfa967
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/applications/postbuildstepper/src/main.rs b/applications/postbuildstepper/src/main.rs
@@ -2,6 +2,19 @@ use anyhow::{bail, Context};
 use log::{debug, info, trace};
 use std::collections::{HashMap, HashSet};
 
+/*
+set -Eu -o pipefail
+
+env
+
+ls -lha ''${SECRET_cacheHoloHost2public}
+cat ''${SECRET_cacheHoloHost2public}
+
+echo ''${SECRET_cacheHoloHost2public} > public-key
+cat public-key
+
+*/
+
 fn main() -> anyhow::Result<()> {
     env_logger::builder()
         .filter_level(log::LevelFilter::Debug)

diff --git a/modules/flake-parts/nixosConfigurations.buildbot-nix-0/configuration.nix b/modules/flake-parts/nixosConfigurations.buildbot-nix-0/configuration.nix
@@ -329,29 +329,7 @@
                 )
               ) (builtins.attrNames config.passthru.buildbot-secrets)
             );
-          command = [
-            (builtins.toString (
-              pkgs.writeShellScript "sign-and-upload" ''
-                set -Eu -o pipefail
-
-                env
-
-                ls -lha ''${SECRET_cacheHoloHost2public}
-                cat ''${SECRET_cacheHoloHost2public}
-
-                echo ''${SECRET_cacheHoloHost2public} > public-key
-                cat public-key
-
-                if [[ "$PROP_owners" = "['steveej']" ]]; then
-                  echo only steveej owns this change.
-                else
-                  echo "$PROP_owners" own this change.
-                fi
-
-                exec ${lib.getExe' self.packages.${pkgs.system}.postbuildstepper "postbuildstepper"} "$@"
-              ''
-            ))
-          ];
+          command = [ (lib.getExe' self.packages.${pkgs.system}.postbuildstepper "postbuildstepper") ];
         }
 
       ];