Merge branch 'devel' of https://github.com/elmercsc/elmerfem into devel

ElmerCSC · Aug 26, 2024 · f55127f · f55127f
2 parents 3211a93 + c3dbfa2
commit f55127f
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 12 deletions.
diff --git a/.github/workflows/nix.yaml → .github/workflows/nix-cachix.yaml b/.github/workflows/nix.yaml → .github/workflows/nix-cachix.yaml
@@ -1,4 +1,4 @@
-name: "nix flake checks and cachix"
+name: "nix build and push to cache"
 on:
   pull_request:
   push:
@@ -10,10 +10,14 @@ jobs:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v27
       with:
-        nix_path: nixpkgs=channel:nixos-unstable
+        nix_path: nixpkgs=channel:nixos-24.05
     - uses: DeterminateSystems/magic-nix-cache-action@v2
     - uses: cachix/cachix-action@v14
       with:
         name: elmerfem
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix flake check -L
+    - name: nix build
+      run: |
+        nix build -L
+        nix build .#gui -L
+        nix build .#full -L
diff --git a/.github/workflows/nix-check.yaml b/.github/workflows/nix-check.yaml
@@ -0,0 +1,16 @@
+name: "nix flake check"
+on:
+  pull_request:
+  push:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v27
+      with:
+        nix_path: nixpkgs=channel:nixos-24.05
+    - uses: DeterminateSystems/magic-nix-cache-action@v2
+    - name: nix flake check
+      run: nix flake check -L
diff --git a/flake.nix b/flake.nix
@@ -32,6 +32,15 @@
     };
   };
 
+  nixConfig = {
+    extra-substituters = [
+      "https://elmerfem.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "elmerfem.cachix.org-1:nWIb5JzEzC2/W6qiuaC0urJRG+S7KvTn9WatX43gkHk="
+    ];
+  };
+
   outputs = {
     self,
     nixpkgs,
@@ -68,15 +77,27 @@
 
             src = nix-filter {
               root = self;
-              exclude = [
-                (nix-filter.lib.matchExt "nix")
-                "flake.lock"
-                ".git"
-                ".github"
-                ".gitignore"
-                ".gitmodules"
-                ".travis.yml"
-                ".vscode"
+              include = [
+                "cmake"
+                "CMakeLists.txt"
+                "contrib"
+                "cpack"
+                "elmergrid"
+                "ElmerGUI"
+                "ElmerGUIlogger"
+                "ElmerGUItester"
+                "elmerice"
+                "ElmerWorkflows"
+                "fem"
+                "fhutiter"
+                "license_texts"
+                "matc"
+                "mathlibs"
+                "meshgen2d"
+                "misc"
+                "pics"
+                "post"
+                "umfpack"
               ];
             };