Merge pull request #2 from MoonVision/nix-cache

Build for more systems and push results to cache
MoonVision · May 24, 2024 · 137a2aa · 137a2aa
2 parents 9786c64 + f972c3d
commit 137a2aa
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 56 deletions.
diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml
@@ -1,13 +1,38 @@
-name: "Build legacy Nix package on Ubuntu"
+name: "Build Nix packages for various platforms"
 
 on:
   push:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            system: x86_64-linux
+          - os: macos-latest
+            system: x86_64-darwin
+          - os: macos-latest
+            system: aarch64-darwin
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v12
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+        with:
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+          nix_path: nixpkgs=channel:nixos-unstable
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+            extra-platforms = x86_64-linux x86_64-darwin aarch64-darwin
+            accept-flake-config = true
+      - name: Install Rosetta
+        if: ${{ contains(matrix.system, 'x86_64-darwin') }}
+        run: sudo softwareupdate --install-rosetta --agree-to-license
+      - name: Install attic
+        run: |
+          nix run nixpkgs#attic-client login internal "https://attic.internal.moonvision.io" "${{ secrets.ATTIC_SECRET_KEY }}"
+          nix run nixpkgs#attic-client use moonvision-foss
       - name: Building package
-        run: nix-build . -A defaultPackage.x86_64-linux
+        run: nix build .#packages.${{ matrix.system }}.default
+      - name: Push result to cache
+        run: nix run nixpkgs#attic-client push moonvision-foss result
diff --git a/default.nix b/default.nix
@@ -1,7 +1,9 @@
 (import (
-  fetchTarball {
-    url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz";
-    sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; }
-) {
-  src =  ./.;
-}).defaultNix
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz";
+      sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2";
+    }
+  ) {
+    src = ./.;
+  })
+.defaultNix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,38 +5,53 @@
     utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, utils, naersk }:
-    utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-        naersk-lib = pkgs.callPackage naersk { };
-      in
-      {
-        defaultPackage = naersk-lib.buildPackage {
-          src =./.;
+  nixConfig = {
+    extra-substituters = [ "https://attic.internal.moonvision.io/moonvision-foss" ];
+    extra-trusted-public-keys = [ "moonvision-foss:9nKTaMgGQ1M1+CYCftDNWQD39fESVxcp9o8GwRf1B3M=" ];
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    utils,
+    naersk,
+  }:
+    utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {inherit system;};
+      naersk-lib = pkgs.callPackage naersk {};
+    in {
+      defaultPackage = self.packages.${system}.jira-tools;
+      packages = {
+        default = self.packages.${system}.jira-tools;
+        jira-tools = naersk-lib.buildPackage {
+          src = ./.;
           buildInputs = with pkgs; [
             openssl
             pkg-config
           ];
         };
-        devShell = with pkgs; mkShell {
-          buildInputs = [
-            cargo
-            libiconv
-            openssl
-            rustc
-            rustfmt
-            pre-commit
-            rustPackages.clippy
-          ] ++
-          (lib.optionals pkgs.stdenv.isDarwin [
-            pkgs.darwin.apple_sdk.frameworks.AppKit
-            pkgs.darwin.apple_sdk.frameworks.CoreFoundation
-            pkgs.darwin.apple_sdk.frameworks.CoreServices
-            pkgs.darwin.apple_sdk.frameworks.Foundation
-            pkgs.darwin.apple_sdk.frameworks.Security
-          ]);
+      };
+      devShell = with pkgs;
+        mkShell {
+          buildInputs =
+            [
+              cargo
+              libiconv
+              openssl
+              rustc
+              rustfmt
+              pre-commit
+              rustPackages.clippy
+            ]
+            ++ (lib.optionals pkgs.stdenv.isDarwin [
+              pkgs.darwin.apple_sdk.frameworks.AppKit
+              pkgs.darwin.apple_sdk.frameworks.CoreFoundation
+              pkgs.darwin.apple_sdk.frameworks.CoreServices
+              pkgs.darwin.apple_sdk.frameworks.Foundation
+              pkgs.darwin.apple_sdk.frameworks.Security
+            ]);
           RUST_SRC_PATH = rustPlatform.rustLibSrc;
         };
-      });
+      formatter = pkgs.alejandra;
+    });
 }
diff --git a/shell.nix b/shell.nix
@@ -1,7 +1,9 @@
 (import (
-  fetchTarball {
-    url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz";
-    sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; }
-) {
-  src =  ./.;
-}).shellNix
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz";
+      sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2";
+    }
+  ) {
+    src = ./.;
+  })
+.shellNix