From dd2f86135b3e6ae0907a346d0085161d704ca633 Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Fri, 13 Dec 2024 18:59:12 +0530 Subject: [PATCH] nix: use flake for builds --- Jenkinsfile | 22 +++++++++++++--------- flake.lock | 26 ++++++++++++++++++++++++++ flake.nix | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 9 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/Jenkinsfile b/Jenkinsfile index 148d8d851a..f6bf90f9fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,14 +22,16 @@ pipeline { stages { stage('Install') { steps { - sh 'yarn install' + script { + nix.develop('yarn install') + } } } stage('Build') { steps { script { - sh 'yarn build' + nix.develop('yarn build') jenkins.genBuildMetaJSON('build/build.json') } } @@ -38,13 +40,15 @@ pipeline { stage('Publish') { steps { sshagent(credentials: ['status-im-auto-ssh']) { - sh """ - ghp-import \ - -b ${deployBranch()} \ - -c ${deployDomain()} \ - -p build - """ - } + script { + nix.develop(""" + ghp-import \ + -b ${deployBranch()} \ + -c ${deployDomain()} \ + -p build + """, pure: false) + } + } } } } diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000000..cabb09ea5f --- /dev/null +++ b/flake.lock @@ -0,0 +1,26 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1733730953, + "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7109b680d161993918b0a126f38bc39763e5a709", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000000..4bad77930d --- /dev/null +++ b/flake.nix @@ -0,0 +1,35 @@ +{ + description = "Flake file for logos website "; + + inputs = { + nixpkgs.url = "nixpkgs/nixos-24.05"; + }; + + outputs = + { self, nixpkgs }: + let + supportedSystems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + forEachSystem = nixpkgs.lib.genAttrs supportedSystems; + pkgsFor = forEachSystem (system: import nixpkgs { inherit system; }); + in + rec { + formatter = forEachSystem (system: pkgsFor.${system}.nixpkgs-fmt); + + devShells = forEachSystem (system: { + default = pkgsFor.${system}.mkShellNoCC { + packages = with pkgsFor.${system}.buildPackages; [ + git + openssh + yarn # 1.22.22 + nodejs_20 # v20.15.1 + ghp-import # 2.1.0 + ]; + }; + }); + }; +}