Syzygial/New-Alan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New Deploy Architecture

Browse Source
This commit is contained in:
DavidCrompton1192@gmail.com
2023-03-09 21:59:09 -05:00
parent 06bb7962d2
commit fe9385ff2b
3 changed files with 79 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/flake.nix
View File

@@ -1,6 +1,6 @@
{ {
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.newalan.url = "../"; inputs.newalan.url = "https://git.syzygial.cc/Syzygial/New-Alan/archive/main.tar.gz";
outputs = { self, nixpkgs, newalan }: let outputs = { self, nixpkgs, newalan }: let
new_alan_overlay = (final: prev: { new_alan_overlay = (final: prev: {

39
flake.nix
View File

@@ -115,28 +115,23 @@
hydraJobs = checks // lib.optionalAttrs hydraJobs = checks // lib.optionalAttrs
(system == "x86_64-linux" ) { (system == "x86_64-linux" ) {
runCommandHook = { runCommandHook = let
newalan = pkgs.writeScript "run-me" '' deployFlake = pkgs.runCommand "deploy-flake" {} ''
#!${pkgs.runtimeShell} substitute ${./deploy/flake.nix} $out \
export bd=$(mktemp -d) --replace "main.tar.gz" "${self.rev}.tar.gz"
chmod -R g=u $bd '';
cd $bd in {
newalan = pkgs.runCommand {
echo Working in: $bd nativeBuildInputs = [
echo Downloading revision... newalan
${pkgs.wget}/bin/wget https://git.syzygial.cc/Syzygial/New-Alan/archive/${self.rev}.zip checks.newalan-nextest
];
${pkgs.unzip}/bin/unzip ${self.rev}.zip } ''
rm ${self.rev}.zip echo '#!${pkgs.runtimeShell}' >> $out
cd * echo 'export flake=${deployFlake}' >> $out
export bd2=$(realpath .) echo Deploying $flake
ls echo '# ${pkgs.runtimeShell} ./secrets/deploy.sh' >> $out
PATH=${pkgs.nixos-container}/bin:$PATH chmod +x $out
${pkgs.sops}/bin/sops -i -d secrets/deploy.sh
chmod +x ./secrets/deploy.sh
${pkgs.runtimeShell} ./secrets/deploy.sh
cd
rm -rf $bd
''; '';
}; };
}; };

6
secrets/deploy.sh
View File

@@ -1,5 +1,5 @@
{ {
"data": "ENC[AES256_GCM,data:SZcrWUnPbxHhQ5NHGgYaVboy/jwxJn3qDJiXd0sb/NUe0Cx3RHV+/IEFvJz1tJOiChB064pPJhBcwe0YY64x4WJLPsF1eAJwB2dWMPFRmltdqQfVWQU0Vh8wB3ih+4IQrtQ+MugEYn8YYd2IMbUOCq5KIwG26YCIqC/9DIO6efs9zUd5lJ61DgXpFC9mqpDFrgP9OefssJ42KlZu,iv:nG6OtPFHbZAXZi08Vdf+WItarj77PQYeZ9yLeWaYar8=,tag:KXLdO4s8t1mL5F0/rCeKqQ==,type:str]", "data": "ENC[AES256_GCM,data:0Hzi3BuNQEZj+vKy9/zgF+Qyc2BWCoAjHa4YB0AEK1zJU8z8HcfnNBQbWgZ7Wjyl8qIDI2nRlBeELgErg5GeVCf/TEEFXy+sCyThmX0tbJK5WQN/vGGA+5nS4eZEFCFMeB2XmoYz1hB6gg==,iv:vJeFS0ErNAUnercb9MkO7CUyVpKwV9l3xIw/JGkxjrE=,tag:eEL16Ep/M0Ep93BZL2Sh5w==,type:str]",
"sops": { "sops": {
"kms": null, "kms": null,
"gcp_kms": null, "gcp_kms": null,
@@ -15,8 +15,8 @@
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKdUtHMERreXlZTGRGMWlM\nbldjMHFWWWRQZHRvZWx5QmhmVno0VmZQNmljCnFRUnZxT29iZkNxaExQbCtUNFFy\nMkttVkkrQkh0Ky91bnRxRmJ4VDk0N2MKLS0tIHhYREFwRUZ6a1BDM1FWZjlpcTJR\nVW5YSkwvZWQyMXNuaUdBTWpwa2Y1VWcKawzPRiMB/ruOBCylNssB/k+hITJDYX+6\nKpwHk9Avh6Pzhptm21yeY1zmVQkqEx6YU24aJiqs1RRmrQAvnWr3WQ==\n-----END AGE ENCRYPTED FILE-----\n" "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKdUtHMERreXlZTGRGMWlM\nbldjMHFWWWRQZHRvZWx5QmhmVno0VmZQNmljCnFRUnZxT29iZkNxaExQbCtUNFFy\nMkttVkkrQkh0Ky91bnRxRmJ4VDk0N2MKLS0tIHhYREFwRUZ6a1BDM1FWZjlpcTJR\nVW5YSkwvZWQyMXNuaUdBTWpwa2Y1VWcKawzPRiMB/ruOBCylNssB/k+hITJDYX+6\nKpwHk9Avh6Pzhptm21yeY1zmVQkqEx6YU24aJiqs1RRmrQAvnWr3WQ==\n-----END AGE ENCRYPTED FILE-----\n"
} }
], ],
"lastmodified": "2023-03-10T01:38:34Z", "lastmodified": "2023-03-10T02:38:06Z",
"mac": "ENC[AES256_GCM,data:QNkqpBLYY45OVsENf7k/lrCZCKyvZBTY+XGc4aYC/t8LXfa8xGpaHcFb7OFqqetcBZw3azb2BL2y29bA+Lm69DjhUzIFX7wJal6qyAxi/HZC6sKzKr+D4Gr7/KRpG/2NaqoLkugsXoDHKWi0Y6mCrcJRPJqo5Nw0AFdWS9IJc0I=,iv:wQc/XZcXK/maSHtQx/Ut4SH0xrPalLVHTqBa2U3lMMY=,tag:y2T9Isxrhqy0J/WcaOCS+A==,type:str]", "mac": "ENC[AES256_GCM,data:9KPlaPXXdiK1XiApKoXxm9rs0heIAFQl1E2yBD7D7PjxPrKtspjcWU6sP3ETG9M9KQXJt/Gyrm5oopccy3Ay1APV/+gIZFNMTXiFLPLiEaPugXTR4F9Vqs8SRRFqPKh3PnIWyb6I2CLvkiq0iz0M9KjdpridsRteIBVTLEAwUJs=,iv:XnjHdXOuc6911zu+gV4bIpOX6tgfpiIcZ0nD7KHMzwo=,tag:+KbkfaOsvLsMnSlajGMbqw==,type:str]",
"pgp": null, "pgp": null,
"unencrypted_suffix": "_unencrypted", "unencrypted_suffix": "_unencrypted",
"version": "3.7.3" "version": "3.7.3"